This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 337d180534b86e0b74bb69cd59af5146119236c7
Merge: 2737305 b24c34b
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun Nov 29 12:59:55 2020 +0100
Merge branch 'master' into MNG-6957
.../src/main/java/org/apache/maven/project/ReactorModelPool.java | 4 ++--
.../apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java | 2 +-
.../src/main/java/org/apache/maven/feature/Features.java | 4 ++--
.../apache/maven/model/building/AbstractModelSourceTransformer.java | 2 +-
.../java/org/apache/maven/model/building/ArtifactModelSource.java | 2 +-
.../org/apache/maven/model/building/BuildModelSourceTransformer.java | 2 +-
.../apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java | 2 +-
.../java/org/apache/maven/model/building/DefaultModelBuilder.java | 2 +-
.../apache/maven/model/building/DefaultModelSourceTransformer.java | 2 +-
.../java/org/apache/maven/model/building/ModelBuildingRequest.java | 3 +++
.../src/main/java/org/apache/maven/model/building/ModelCache.java | 4 ++--
.../java/org/apache/maven/model/building/ModelSourceTransformer.java | 2 +-
.../main/java/org/apache/maven/model/building/TransformerContext.java | 2 +-
.../java/org/apache/maven/model/building/TransformerException.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/Factories.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEvent.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventFactory.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventUtils.java | 2 +-
.../main/java/org/apache/maven/xml/sax/ext/CommentRenormalizer.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/AbstractEventXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java | 2 +-
.../org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilter.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java | 2 +-
.../src/main/java/org/apache/maven/xml/sax/filter/DependencyKey.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/ModulesXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/ParentXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/RelativePathXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/RelativeProject.java | 2 +-
.../src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
36 files changed, 41 insertions(+), 38 deletions(-)
diff --cc
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
index 4460f45,cf095e0..189e5ef
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
@@@ -32,10 -32,9 +32,10 @@@ import org.apache.maven.xml.sax.filter.
import org.xml.sax.ext.LexicalHandler;
/**
- *
+ * A BuildPomXMLFilterFactory which is context aware
+ *
* @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
*/
public class DefaultBuildPomXMLFilterFactory extends BuildPomXMLFilterFactory
{
diff --cc
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
index efd4ec1,c9451ef..f3d42b5
---
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
@@@ -63,26 -63,27 +63,29 @@@ public interface ModelBuildingReques
* Denotes strict validation as recommended by the current Maven version.
*/
int VALIDATION_LEVEL_STRICT = VALIDATION_LEVEL_MAVEN_3_0;
-
+
/**
- *
- * @return the file model
+ * Gets the file model to build (with profile activatio).
+ * 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 );
-
+
/**
- * Gets the raw model to build. If not set, model source will be used to
load raw model.
- *
- * @return The raw model to build or {@code null} if not set.
+ * @deprecated rawModel is never set, instead the fileModel is set
*/
+ @Deprecated
Model getRawModel();
/**
diff --cc
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
index e62c80b,b502e1e..bc3743b
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
@@@ -24,13 -24,9 +24,13 @@@ import java.io.InputStream
import java.nio.file.Path;
/**
+ * The ModelSourceTransformer is a way to transform the local pom while
streaming the input.
+ *
+ * The {@link #transform(Path, TransformerContext)} method uses a Path on
purpose, to ensure the
+ * local pom is the the original source.
*
* @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
*/
public interface ModelSourceTransformer
{
