This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-3.8.x in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6f548e5e52c1d63d4fceeb412ebc997418e30724 Author: Andrey Bruykhov <[email protected]> AuthorDate: Mon Feb 6 19:58:10 2023 +0300 Added missing @Deprecated/@deprecated annotations @Deprecated annotatio is helpful to prevent usage of deprecated API. For example: developer can see crossed out method/field name if this item is deprecated. --- .../main/java/org/apache/maven/profiles/DefaultProfileManager.java | 1 + .../java/org/apache/maven/project/InvalidProjectModelException.java | 2 ++ .../apache/maven/project/inheritance/ModelInheritanceAssembler.java | 1 - .../project/interpolation/AbstractStringBasedModelInterpolator.java | 1 + .../org/apache/maven/project/interpolation/ModelInterpolator.java | 2 ++ .../org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java | 1 + .../java/org/apache/maven/project/DuplicateProjectException.java | 2 ++ .../main/java/org/apache/maven/project/ProjectBuildingException.java | 1 + .../java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java | 5 +++-- 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index 989062271..9ca996aac 100644 --- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -67,6 +67,7 @@ public class DefaultProfileManager * @deprecated without passing in the system properties, the SystemPropertiesProfileActivator will not work * correctly in embedded environments. */ + @Deprecated public DefaultProfileManager( PlexusContainer container ) { this( container, null ); diff --git a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java index d7241fdc3..346cc013c 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java +++ b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java @@ -44,6 +44,7 @@ public class InvalidProjectModelException * @param validationResult * @deprecated use {@link File} constructor for pomLocation */ + @Deprecated public InvalidProjectModelException( String projectId, String pomLocation, String message, ModelValidationResult validationResult ) { @@ -64,6 +65,7 @@ public class InvalidProjectModelException * @param message * @deprecated use {@link File} constructor for pomLocation */ + @Deprecated public InvalidProjectModelException( String projectId, String pomLocation, String message ) { this( projectId, message, new File( pomLocation ) ); diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java index bf8a63b4e..600f741dd 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java @@ -24,7 +24,6 @@ import org.apache.maven.model.Model; /** * @author Jason van Zyl - * @deprecated */ @Deprecated public interface ModelInheritanceAssembler diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java index 996baef59..93806382c 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java @@ -126,6 +126,7 @@ public abstract class AbstractStringBasedModelInterpolator * * @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead. */ + @Deprecated public Model interpolate( Model model, Map<String, ?> context, boolean strict ) throws ModelInterpolationException { diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java index 036e7f048..ea5bcd555 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java @@ -40,12 +40,14 @@ public interface ModelInterpolator /** * @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead. */ + @Deprecated Model interpolate( Model project, Map<String, ?> context ) throws ModelInterpolationException; /** * @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead. */ + @Deprecated Model interpolate( Model model, Map<String, ?> context, boolean strict ) throws ModelInterpolationException; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java index e12debef5..53d51d028 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java @@ -35,6 +35,7 @@ public class DefaultLifecycleMapping private Map<String, Lifecycle> lifecycleMap; /** @deprecated use lifecycles instead */ + @Deprecated private Map<String, LifecyclePhase> phases; /** diff --git a/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java b/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java index f73c46b28..2e784af3c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java +++ b/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java @@ -38,6 +38,7 @@ public class DuplicateProjectException /** * @deprecated use {@link #DuplicateProjectException(String, File, File, String)} */ + @Deprecated public DuplicateProjectException( String message ) { this( null, null, null, message ); @@ -46,6 +47,7 @@ public class DuplicateProjectException /** * @deprecated use {@link #DuplicateProjectException(String, File, File, String)} */ + @Deprecated public DuplicateProjectException( String message, Exception e ) { super( message, e ); diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java index 7786c90de..e5265bd5e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java @@ -85,6 +85,7 @@ public class ProjectBuildingException /** * @deprecated use {@link #getPomFile()} */ + @Deprecated public String getPomLocation() { if ( getPomFile() != null ) diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java index 9cfcff385..2316efb32 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java @@ -26,10 +26,11 @@ import org.codehaus.plexus.logging.Logger; * Provides backwards compatibility with Maven 3.2.3 and earlier. Clients that do not require compatibility with Maven * 3.2.3 and earlier are encouraged to use {@link JavaToolchainImpl}. * <strong>Note:</strong> This is an internal component whose interface can change without prior notice. - * + * * @deprecated clients that do not require compatibility with Maven 3.2.3 and earlier should link to * {@link JavaToolchainImpl} instead. */ +@Deprecated public class DefaultJavaToolChain extends JavaToolchainImpl { @@ -52,4 +53,4 @@ public class DefaultJavaToolChain super.setJavaHome( javaHome ); } -} \ No newline at end of file +}
