You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/11/29 12:00:10 UTC
[maven] branch MNG-6957 updated (b6f0b12 -> 337d180)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git.
from b6f0b12 Merge branch 'master' into MNG-6957
add ba7a037 Refactor ProjectsCollector.collectProjects
add a89a3d3 [MNG-6999] prevent potential race condition
add 7a4b77b [MNG-6548] Lifecycle plugin version upgrades
add 230773a [MNG-6554] Packaging 'ear' binding plugin upgrades
add 6d75136 [MNG-6552] Packaging 'ejb' binding plugin upgrades
add 658b7a9 [MNG-6552] Packaging 'rar' binding plugin upgrades
add 033a7a2 [MNG-6553] Packaging 'war' binding plugin upgrades
add 7b04f82 [MNG-6556] Packaging 'maven-plugin' binding plugin upgrades
add 7251b8d [MNG-6551] Packaging 'jar' binding plugin upgrades
add 2072372 [MNG-6550] Packaging 'pom' binding plugin upgrades
add 7268880 [MNG-6754] Set the same timestamp in multi module builds
add 827224c [MNG-7019] Notify also at start when profile is missing
add 3736be9 Updating version in preparation for Maven 4
new 2737305 Merge branch 'master' into MNG-6957
add b24c34b [MNG-7041] Update @since, version ranges and other version related strings
new 337d180 Merge branch 'master' into MNG-6957
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../installer/DefaultArtifactInstaller.java | 1 +
.../transform/ReleaseArtifactTransformation.java | 1 +
.../resolver/transform/SnapshotTransformation.java | 1 +
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../metadata/AbstractRepositoryMetadata.java | 1 -
.../DefaultRepositorySystemSessionFactory.java | 11 +--
.../org/apache/maven/project/ReactorModelPool.java | 4 +-
...Collector.java => DefaultProjectsSelector.java} | 15 ++--
.../collector/MultiModuleCollectionStrategy.java | 9 +-
.../collector/PomlessCollectionStrategy.java | 6 +-
...rojectsCollector.java => ProjectsSelector.java} | 10 +--
.../collector/RequestPomCollectionStrategy.java | 11 +--
.../DefaultConsumerPomXMLFilterFactory.java | 2 +-
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../resources/META-INF/plexus/default-bindings.xml | 100 +++++++++++----------
.../maven/graph/DefaultGraphBuilderTest.java | 10 +--
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
.../java/org/apache/maven/feature/Features.java | 4 +-
.../building/AbstractModelSourceTransformer.java | 14 ++-
.../maven/model/building/ArtifactModelSource.java | 2 +-
.../building/BuildModelSourceTransformer.java | 2 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 2 +-
.../building/DefaultModelSourceTransformer.java | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 3 +
.../apache/maven/model/building/ModelCache.java | 4 +-
.../model/building/ModelSourceTransformer.java | 2 +-
.../maven/model/building/TransformerContext.java | 2 +-
.../maven/model/building/TransformerException.java | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 15 ++--
.../internal/LocalSnapshotMetadataGenerator.java | 7 +-
.../maven/repository/internal/MavenMetadata.java | 8 +-
.../repository/internal/MavenSnapshotMetadata.java | 5 +-
.../internal/RemoteSnapshotMetadata.java | 14 +--
.../internal/RemoteSnapshotMetadataGenerator.java | 9 +-
.../repository/internal/VersionsMetadata.java | 13 +--
.../internal/VersionsMetadataGenerator.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 2 +-
maven-xml/pom.xml | 2 +-
.../main/java/org/apache/maven/xml/Factories.java | 2 +-
.../java/org/apache/maven/xml/sax/SAXEvent.java | 2 +-
.../org/apache/maven/xml/sax/SAXEventFactory.java | 2 +-
.../org/apache/maven/xml/sax/SAXEventUtils.java | 2 +-
.../maven/xml/sax/ext/CommentRenormalizer.java | 2 +-
.../xml/sax/filter/AbstractEventXMLFilter.java | 2 +-
.../maven/xml/sax/filter/AbstractSAXFilter.java | 2 +-
.../maven/xml/sax/filter/BuildPomXMLFilter.java | 2 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 2 +-
.../xml/sax/filter/BuildPomXMLFilterListener.java | 2 +-
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 2 +-
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 2 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 2 +-
.../apache/maven/xml/sax/filter/DependencyKey.java | 2 +-
.../maven/xml/sax/filter/FastForwardFilter.java | 2 +-
.../maven/xml/sax/filter/ModulesXMLFilter.java | 2 +-
.../maven/xml/sax/filter/ParentXMLFilter.java | 2 +-
.../xml/sax/filter/ReactorDependencyXMLFilter.java | 2 +-
.../xml/sax/filter/RelativePathXMLFilter.java | 2 +-
.../maven/xml/sax/filter/RelativeProject.java | 2 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
pom.xml | 2 +-
78 files changed, 211 insertions(+), 182 deletions(-)
rename maven-core/src/main/java/org/apache/maven/project/collector/{DefaultProjectsCollector.java => DefaultProjectsSelector.java} (87%)
rename maven-core/src/main/java/org/apache/maven/project/collector/{ProjectsCollector.java => ProjectsSelector.java} (79%)
[maven] 01/02: Merge branch 'master' into MNG-6957
Posted by rf...@apache.org.
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 2737305793de27363a25ba49797b949ea3cf4335
Merge: b6f0b12 3736be9
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Nov 28 15:15:20 2020 +0100
Merge branch 'master' into MNG-6957
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../installer/DefaultArtifactInstaller.java | 1 +
.../transform/ReleaseArtifactTransformation.java | 1 +
.../resolver/transform/SnapshotTransformation.java | 1 +
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../metadata/AbstractRepositoryMetadata.java | 1 -
.../DefaultRepositorySystemSessionFactory.java | 11 +--
...Collector.java => DefaultProjectsSelector.java} | 15 ++--
.../collector/MultiModuleCollectionStrategy.java | 9 +-
.../collector/PomlessCollectionStrategy.java | 6 +-
...rojectsCollector.java => ProjectsSelector.java} | 10 +--
.../collector/RequestPomCollectionStrategy.java | 11 +--
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../resources/META-INF/plexus/default-bindings.xml | 100 +++++++++++----------
.../maven/graph/DefaultGraphBuilderTest.java | 10 +--
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
.../building/AbstractModelSourceTransformer.java | 12 ++-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 15 ++--
.../internal/LocalSnapshotMetadataGenerator.java | 7 +-
.../maven/repository/internal/MavenMetadata.java | 8 +-
.../repository/internal/MavenSnapshotMetadata.java | 5 +-
.../internal/RemoteSnapshotMetadata.java | 14 +--
.../internal/RemoteSnapshotMetadataGenerator.java | 9 +-
.../repository/internal/VersionsMetadata.java | 13 +--
.../internal/VersionsMetadataGenerator.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 2 +-
maven-xml/pom.xml | 2 +-
pom.xml | 2 +-
43 files changed, 170 insertions(+), 144 deletions(-)
[maven] 02/02: Merge branch 'master' into MNG-6957
Posted by rf...@apache.org.
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 <rf...@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
{