[MNG-8264] Deprecate maven 3 specific modules

maven-model-builder/pom.xml

@@ -28,7 +28,7 @@ under the License.
 
   <artifactId>maven-model-builder</artifactId>
 
-  <name>Maven Model Builder</name>
+  <name>Maven Model Builder (deprecated)</name>
   <description>The effective model builder, with inheritance, profile activation, interpolation, ...</description>
 
   <properties>

maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java

@@ -21,7 +21,9 @@
 /**
  * Provides a skeleton implementation for model building listeners. The methods of this class are empty.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class AbstractModelBuildingListener implements ModelBuildingListener {
 
     @Override

maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java

@@ -28,7 +28,9 @@
  * Represents a model pulled from a repository
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class ArtifactModelSource extends FileSource implements ModelSource {
     private final String groupId;
 

maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java

@@ -36,9 +36,11 @@
  * ModelSourceTransformer for the build pom
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
 @Named
 @Singleton
+@Deprecated(since = "4.0.0")
 class BuildModelSourceTransformer implements ModelSourceTransformer {
 
     public static final String NAMESPACE_PREFIX = "http://maven.apache.org/POM/";

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

@@ -101,9 +101,11 @@
 import static org.apache.maven.model.building.Result.newResult;
 
 /**
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
 @Named
 @Singleton
+@Deprecated(since = "4.0.0")
 public class DefaultModelBuilder implements ModelBuilder {
 
     private final ModelProcessor modelProcessor;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java

@@ -85,7 +85,9 @@
  * this factory to provide custom implementations for some of the components used by the model builder, or use the
  * builder API to inject custom instances.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class DefaultModelBuilderFactory {
 
     private ModelProcessor modelProcessor;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java

@@ -23,7 +23,9 @@
 /**
  * Holds data relevant for a model building event.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultModelBuildingEvent implements ModelBuildingEvent {
 
     private Model model;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java

@@ -33,7 +33,9 @@
 /**
  * Collects settings that control building of effective models.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class DefaultModelBuildingRequest implements ModelBuildingRequest {
     private Model fileModel;
 

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java

@@ -30,7 +30,9 @@
 /**
  * Collects the output of the model builder.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultModelBuildingResult implements ModelBuildingResult {
     private Model fileModel;
 

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java

@@ -25,7 +25,9 @@
  * or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits
  * the problem.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class DefaultModelProblem implements ModelProblem {
 
     private final String source;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java

@@ -32,7 +32,9 @@
  * it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on
  * providing a simple error message, leaving the donkey work of creating a nice model problem to this component.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultModelProblemCollector implements ModelProblemCollectorExt {
 
     private final ModelBuildingResult result;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java

@@ -66,10 +66,13 @@
  * As a non-default component this now gets a negative priority relative to other implementations
  * of the same interface. Since we want to allow overriding this doesn't matter in this case.
  * (if it did we could add @Priority of 0 to match the priority given to default components.)
+ *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
 @Named("core-default")
 @Singleton
 @Typed(ModelProcessor.class)
+@Deprecated(since = "4.0.0")
 public class DefaultModelProcessor implements ModelProcessor {
 
     private final Collection<ModelParser> modelParsers;

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java

@@ -31,7 +31,9 @@
 /**
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultTransformerContext implements TransformerContext {
     final ModelLocator modelLocator;
 

maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java

@@ -37,7 +37,9 @@
  * This is an inner class, as it must be able to call readRawModel()
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultTransformerContextBuilder implements TransformerContextBuilder {
     private final Graph dag = new Graph();
     private final DefaultModelBuilder defaultModelBuilder;

maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java

@@ -28,7 +28,9 @@
 /**
  * Wraps an ordinary {@link File} as a model source.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class FileModelSource extends FileSource implements ModelSource3 {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java

@@ -41,7 +41,9 @@
  * All others can simply be copied from source to target to restore the locationTracker
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class FileToRawModelMerger extends MavenMerger {
 
     @Override

maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java

@@ -33,7 +33,9 @@
  * A model building request that delegates all methods invocations to another request, meant for easy transformations by
  * subclassing.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class FilterModelBuildingRequest implements ModelBuildingRequest {
 
     protected ModelBuildingRequest request;

maven-model-builder/src/main/java/org/apache/maven/model/building/Graph.java

@@ -28,6 +28,10 @@
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
+ */
+@Deprecated(since = "4.0.0")
 class Graph {
 
     final Map<String, Set<String>> graph = new LinkedHashMap<>();

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java

@@ -26,7 +26,9 @@
 /**
  * Builds the effective model from a POM.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelBuilder {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java

@@ -23,7 +23,9 @@
 /**
  * Holds data relevant for a model building event.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelBuildingEvent {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java

@@ -22,7 +22,9 @@
  * Assists in firing events from a generic method by abstracting from the actual callback method to be called on the
  * listener.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 interface ModelBuildingEventCatapult {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java

@@ -30,7 +30,9 @@
  * before eventually failing to provide callers with rich error information. Use {@link #getProblems()} to query the
  * details of the failure.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class ModelBuildingException extends Exception {
 
     private final ModelBuildingResult result;

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java

@@ -24,7 +24,9 @@
  * <em>Note:</em> To cope with future extensions to this interface, it is strongly recommended to extend
  * {@link AbstractModelBuildingListener} rather than to directly implement this interface.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelBuildingListener {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java

@@ -32,7 +32,9 @@
 /**
  * Collects settings that control the building of effective models.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelBuildingRequest {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java

@@ -26,7 +26,9 @@
 /**
  * Collects the output of the model builder.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelBuildingResult {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java

@@ -29,7 +29,9 @@
  * identity of a model. The tag allows for further classification of the associated data on the sole discretion of the
  * model builder.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelCache {
 
     <T> T computeIfAbsent(String groupId, String artifactId, String version, String tag, Supplier<T> data);

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java

@@ -26,7 +26,9 @@
  * and a class to provide some type safety when working with the otherwise untyped cache.
  *
  * @param <T> The type of data associated with the tag.
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 interface ModelCacheTag<T> {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java

@@ -27,7 +27,9 @@
  * Holds a model along with some auxiliary information. This internal utility class assists the model builder during POM
  * processing by providing a means to transport information that cannot be (easily) extracted from the model itself.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 class ModelData {
     private final Source source;
 

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java

@@ -25,7 +25,9 @@
  * or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits
  * the problem.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelProblem {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java

@@ -25,7 +25,9 @@
  * it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on
  * providing a simple error message, leaving the donkey work of creating a nice model problem to this component.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelProblemCollector {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java

@@ -22,7 +22,10 @@
 
 /**
  * Extends the ModelProblemCollector by the capacity of returning the collected problems.
+ *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelProblemCollectorExt extends ModelProblemCollector {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java

@@ -27,7 +27,9 @@
 /**
  * Class to wrap request parameters to ModelProblemCollector.addProblem
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public final class ModelProblemCollectorRequest {
 
     private final ModelProblem.Severity severity;

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java

@@ -25,7 +25,9 @@
 /**
  * Assists in the handling of model problems.
  *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class ModelProblemUtils {
 
     /**

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java

@@ -23,7 +23,10 @@
 
 /**
  * ModelProcessor
+ *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 @SuppressWarnings("checkstyle:interfaceistype")
 public interface ModelProcessor extends ModelLocator, ModelReader {
 

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java

@@ -29,7 +29,10 @@
  * <p>
  * ModelSource2 instances are cached in {@link ModelBuildingRequest#getModelCache()}. Implementations must guarantee
  * that the connection to the backing store remains active until request's {@link ModelCache} is discarded or flushed.
+ *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelSource2 extends ModelSource {
     /**
      * Returns model source identified by a path relative to this model source POM. Implementation <strong>MUST</strong>

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java

@@ -23,7 +23,10 @@
 /**
  * Enhancement to the {@link ModelSource2} to support locating POM files using the {@link ModelLocator}
  * when pointing to a directory.
+ *
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelSource3 extends ModelSource2 {
     /**
      * Returns model source identified by a path relative to this model source POM. Implementation <strong>MUST</strong>

maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java

@@ -29,7 +29,9 @@
  * local pom is the original source.
  *
  * @since 4.0.0
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ModelSourceTransformer {
     /**
      *

maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java

@@ -38,7 +38,9 @@
  * Could encode these variants as subclasses, but kept in one for now
  *
  * @param <T> the model type
+ * @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
  */
+@Deprecated(since = "4.0.0")
 public class Result<T> {
 
     /**