Merge branch 'master' into MNG-6957

apache · Nov 29, 2020 · 337d180 · 337d180
2 parents 2737305 + b24c34b
commit 337d180
Show file tree

Hide file tree

Showing 36 changed files with 41 additions and 38 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -44,7 +44,7 @@ class ReactorModelPool
     private final Map<Path, Model> modelsByPath = new HashMap<>();
 
     /**
-     * Get the model by its GAV or (since 3.7.0) by its GA if there is only one.
+     * Get the model by its GAV or (since 4.0.0) by its GA if there is only one.
      *  
      * @param groupId, never {@code null}
      * @param artifactId, never {@code null}
@@ -68,7 +68,7 @@ public Model get( String groupId, String artifactId, String version )
      * 
      * @param path
      * @return the matching model or {@code null}
-     * @since 3.7.0
+     * @since 4.0.0
      */
     public Model get( Path path )
     {

diff --git a/...-core/src/main/java/org/apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java b/...-core/src/main/java/org/apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java
@@ -27,7 +27,7 @@
  * It will provide several values for the consumer pom based on its context.
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class DefaultConsumerPomXMLFilterFactory extends ConsumerPomXMLFilterFactory
 {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java b/maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
@@ -23,7 +23,7 @@
  * Centralized class for feature information
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public final class Features
 {
@@ -42,7 +42,7 @@ public static Feature buildConsumer()
      * Represents some feature
      * 
      * @author Robert Scholte
-     * @since 3.7.0
+     * @since 4.0.0
      */
     public static class Feature
     {

diff --git a/...builder/src/main/java/org/apache/maven/model/building/AbstractModelSourceTransformer.java b/...builder/src/main/java/org/apache/maven/model/building/AbstractModelSourceTransformer.java
@@ -53,7 +53,7 @@
  * Subclasses are responsible for providing the right SAXFilter.
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public abstract class AbstractModelSourceTransformer
     implements ModelSourceTransformer

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java
@@ -28,7 +28,7 @@
  * Represents a model pulled from a repository
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class ArtifactModelSource extends FileSource implements ModelSource
 {

diff --git a/...el-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java b/...el-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java
@@ -42,7 +42,7 @@
  * ModelSourceTransformer for the build pom
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 @Named
 @Singleton

diff --git a/...uilder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java b/...uilder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
@@ -35,7 +35,7 @@
  * A BuildPomXMLFilterFactory which is context aware
  *
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class DefaultBuildPomXMLFilterFactory extends BuildPomXMLFilterFactory
 {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1650,7 +1650,7 @@ protected boolean hasFatalErrors( ModelProblemCollectorExt problems )
      * All others can simply be copied from source to target to restore the locationTracker 
      * 
      * @author Robert Scholte
-     * @since 3.7.0
+     * @since 4.0.0
      */
     class FileToRawModelMerger extends ModelMerger
     {

diff --git a/...-builder/src/main/java/org/apache/maven/model/building/DefaultModelSourceTransformer.java b/...-builder/src/main/java/org/apache/maven/model/building/DefaultModelSourceTransformer.java
@@ -28,7 +28,7 @@
  * Default ModelSourceTransformer, provides pomFile as inputStream and ignores the context 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class DefaultModelSourceTransformer implements ModelSourceTransformer
 {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
@@ -69,13 +69,16 @@ public interface ModelBuildingRequest
      * If not set, model source will be used to load file model.
      *
      * @return The file model to build or {@code null} if not set.
+     * @since 4.0.0
      */
     Model getFileModel();
 
     /**
      * Set the file model with profile activation
      *
      * @param fileModel
+     * @return This request, never {@code null}.
+     * @since 4.0.0
      */
     ModelBuildingRequest setFileModel( Model fileModel );
 

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java
@@ -39,7 +39,7 @@ public interface ModelCache
      * @param path The path of the cache record, must not be {@code null}.
      * @param tag The tag of the cache record, must not be {@code null}.
      * @param data The data to store in the cache, must not be {@code null}.
-     * @since 3.7.0
+     * @since 4.0.0
      */
     default void put( Source path, String tag, Object data ) 
     {
@@ -52,7 +52,7 @@ default void put( Source path, String tag, Object data )
      * @param path The path of the cache record, must not be {@code null}.
      * @param tag The tag of the cache record, must not be {@code null}.
      * @return The requested data or {@code null} if none was present in the cache.
-     * @since 3.7.0
+     * @since 4.0.0
      */
     default Object get( Source path, String tag ) 
     {

diff --git a/...n-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java b/...n-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
@@ -30,7 +30,7 @@
  * local pom is the the original source. 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public interface ModelSourceTransformer
 {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java
@@ -28,7 +28,7 @@
  * 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public interface TransformerContext
 {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java
@@ -22,7 +22,7 @@
 /**
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class TransformerException extends Exception
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/Factories.java b/maven-xml/src/main/java/org/apache/maven/xml/Factories.java
@@ -33,7 +33,7 @@
  * Creates XML related factories with OWASP advices applied
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public final class Factories
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEvent.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEvent.java
@@ -25,7 +25,7 @@
  * Command pattern to gather events which can be executed later on.
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface SAXEvent

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventFactory.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventFactory.java
@@ -28,7 +28,7 @@
  * Factory for SAXEvents
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public final class SAXEventFactory
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventUtils.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventUtils.java
@@ -25,7 +25,7 @@
  * Utility class for SAXEvents
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public final class SAXEventUtils
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/ext/CommentRenormalizer.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/ext/CommentRenormalizer.java
@@ -28,7 +28,7 @@
  * Hence use this class in the LexicalHandler chain to do so 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class CommentRenormalizer implements LexicalHandler
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractEventXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractEventXMLFilter.java
@@ -34,7 +34,7 @@
  * Builds up a list of SAXEvents, which will be executed with {@link #executeEvents()}
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 abstract class AbstractEventXMLFilter extends AbstractSAXFilter
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java
@@ -29,7 +29,7 @@
  * Otherwise the LexicalHandler events might end up before all collected XMLReader events.
  * 
  * @author Robert Scholte
- * @since 3.7.0 
+ * @since 4.0.0
  */
 public class AbstractSAXFilter extends XMLFilterImpl implements LexicalHandler
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java
@@ -29,7 +29,7 @@
  * 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class BuildPomXMLFilter extends AbstractSAXFilter 
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java
@@ -37,7 +37,7 @@
  * Base implementation for providing the BuildPomXML.
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class BuildPomXMLFilterFactory
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java
@@ -25,7 +25,7 @@
  * Listener can be used to capture the result of the build pom
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface BuildPomXMLFilterListener

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilter.java
@@ -28,7 +28,7 @@
  * Resolves all ci-friendly properties occurrences between version-tags
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 class CiFriendlyXMLFilter
     extends AbstractSAXFilter

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java
@@ -31,7 +31,7 @@
  * - {@link org.apache.maven.internal.aether.DefaultRepositorySystemSessionFactory} when publishing pom files.
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class ConsumerPomXMLFilter extends AbstractSAXFilter
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java
@@ -29,7 +29,7 @@
 /**
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class ConsumerPomXMLFilterFactory
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/DependencyKey.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/DependencyKey.java
@@ -24,7 +24,7 @@
 /**
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class DependencyKey
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java
@@ -32,7 +32,7 @@
  * Should be used in case of a DOM that should not be effected by other filters, even though the elements match 
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 class FastForwardFilter extends AbstractSAXFilter
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ModulesXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ModulesXMLFilter.java
@@ -26,7 +26,7 @@
  * Remove all modules, this is just buildtime information
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 class ModulesXMLFilter
     extends AbstractEventXMLFilter

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ParentXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ParentXMLFilter.java
@@ -40,7 +40,7 @@
  * </p>
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 class ParentXMLFilter
     extends AbstractEventXMLFilter

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java
@@ -29,7 +29,7 @@
  * Will apply the version if the dependency is part of the reactor
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class ReactorDependencyXMLFilter extends AbstractEventXMLFilter
 {

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilter.java
@@ -26,7 +26,7 @@
  * Remove relativePath element, has no value for consumer pom
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 class RelativePathXMLFilter
     extends AbstractEventXMLFilter

diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativeProject.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativeProject.java
@@ -22,7 +22,7 @@
 /**
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class RelativeProject
 {

diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
@@ -42,7 +42,7 @@
  * A small example of a pipeline of 2 XML Filters, to understand how to get the expected result
  * 
  * @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
  */
 public class ChainedFilterTest
 {

diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
@@ -191,7 +191,7 @@ public void licenseHeader() throws Exception {
             "  <parent>\n" + 
             "    <groupId>org.apache.maven</groupId>\n" + 
             "    <artifactId>maven</artifactId>\n" + 
-            "    <version>3.7.0-SNAPSHOT</version>\n" + 
+            "    <version>4.0.0-SNAPSHOT</version>\n" + 
             "  </parent>\n" + 
             "  <artifactId>maven-xml</artifactId>\n" + 
             "  <name>Maven XML</name>\n" +