You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/05/23 19:58:34 UTC
[maven] branch MNG-6169/MNG-6551 updated (73677c9 -> aa5ad75)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 73677c9 Upgrade to Maven Deploy Plugin 3.0.0-M1
discard cb9fd99 Upgrade to Maven Install Plugin 3.0.0-M1
discard 170cc96 Upgrade to Maven JAR Plugin 3.1.1
discard 6dee485 Upgrade to Maven Surefire Plugin 3.0.0-M3
discard 8329eaf Upgrade to Maven Compiler Plugin 3.8.0
discard f226c77 Upgrade to Maven Resources Plugin 3.1.0
add 5222f03 [maven-release-plugin] prepare for next development iteration
add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds
add 715d90b Update DOAP Information for new release.
add 0940c7c [MNG-6405] Fix basedir in MavenProject.deepCopy (#225)
add 61d888c [MNG-6646] Upgrade maven-assembly-plugin to 3.1.1
add 763f76c [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
add fdde73f Remove unused code that triggers Error Prone (#245)
add 80c6fe3 [MNG-6643] - Version comparison CLI does not work anymore
add baed5a2 [MNG-6629] - Make ID validation faster
add ebac165 [MNG-6630] - Make ComparableVersion faster
add 44ad1aa [MNG-6631] - Make DefaultArtifactVersion faster
add d34e8fb [MNG-6631] documented the performance intent
add 1e03388 [MNG-6632] - Remember artifact handlers after they've been used once
add 869b615 [MNG-6636] merge reports location tracking
add 5350ed8 [MNG-6644] don't fail if no input location tracking available
add 4ff24e3 [MNG-6643] Integration test
add 2760e3e (doc) - correct plural form of 'child'
add 3ac9718 [MNG-6655] Add support for "release" qualifier
add 1a18eb6 [MNG-6626] fix DefaultExceptionHandler NPE
add 6583012 [MNG-6069] Avoid (some) deprecated commons-cli methods
add ff8c5c8 MNG-6069: unittest with compact and spaced -D options
new d685b1a Upgrade to Maven Resources Plugin 3.1.0
new fa41fd7 Upgrade to Maven Compiler Plugin 3.8.1
new 19bd03c Upgrade to Maven Surefire Plugin 3.0.0-M3
new acb51e0 Upgrade to Maven JAR Plugin 3.1.2
new 31bd6fc Upgrade to Maven Install Plugin 3.0.0-M1
new aa5ad75 Upgrade to Maven Deploy Plugin 3.0.0-M1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (73677c9)
\
N -- N -- N refs/heads/MNG-6169/MNG-6551 (aa5ad75)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 6 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/pom.xml | 2 +-
doap_Maven.rdf | 11 ++
maven-artifact/pom.xml | 14 ++-
.../artifact/versioning/ComparableVersion.java | 122 +++++++++++++++++++--
.../versioning/DefaultArtifactVersion.java | 91 +++++++++------
.../artifact/versioning/ComparableVersionIT.java | 93 ++++++++++++++++
.../artifact/versioning/ComparableVersionTest.java | 12 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../manager/DefaultArtifactHandlerManager.java | 10 +-
.../maven/exception/DefaultExceptionHandler.java | 9 +-
.../project/DefaultProjectBuildingHelper.java | 6 +-
.../org/apache/maven/project/MavenProject.java | 3 +-
.../resources/META-INF/plexus/default-bindings.xml | 6 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 53 ---------
.../exception/DefaultExceptionHandlerTest.java | 53 ++++++++-
.../org/apache/maven/plugin/PluginManagerTest.java | 22 ----
.../org/apache/maven/project/MavenProjectTest.java | 11 ++
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 78 ++++++-------
.../java/org/apache/maven/cli/CLIManagerTest.java | 31 ++++--
maven-model-builder/pom.xml | 2 +-
.../model/plugin/DefaultReportingConverter.java | 2 +-
.../model/validation/DefaultModelValidator.java | 53 +++++++--
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 18 +++
maven-model/src/main/mdo/maven.mdo | 10 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 12 +-
35 files changed, 522 insertions(+), 224 deletions(-)
create mode 100644 maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
copy maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java (51%)
[maven] 05/06: Upgrade to Maven Install Plugin 3.0.0-M1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 31bd6fcfd5e40e7261f61a5c270407dcf9531c8d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 18:46:13 2019 +0100
Upgrade to Maven Install Plugin 3.0.0-M1
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 2a2d8ca..0db8dd0 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -85,7 +85,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-jar-plugin:3.1.2:jar
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
[maven] 06/06: Upgrade to Maven Deploy Plugin 3.0.0-M1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit aa5ad7565535641793844f0ebb0bad787b64b801
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 18:46:51 2019 +0100
Upgrade to Maven Deploy Plugin 3.0.0-M1
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 0db8dd0..8359406 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -88,7 +88,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
</deploy>
</phases>
<!-- END SNIPPET: jar-lifecycle -->
[maven] 04/06: Upgrade to Maven JAR Plugin 3.1.2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit acb51e087b67de8ca0dd7e7825d7c31c5325cb32
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 18:22:03 2019 +0100
Upgrade to Maven JAR Plugin 3.1.2
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 585acc3..2a2d8ca 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -82,7 +82,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.4:jar
+ org.apache.maven.plugins:maven-jar-plugin:3.1.2:jar
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.4:install
[maven] 01/06: Upgrade to Maven Resources Plugin 3.1.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d685b1ae7b40f8606370e0eed4f8505cd1273239
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 15:58:59 2019 +0100
Upgrade to Maven Resources Plugin 3.1.0
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 4a303db..5bbb427 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -67,13 +67,13 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: jar-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
[maven] 03/06: Upgrade to Maven Surefire Plugin 3.0.0-M3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 19bd03cc08b5cff3a7998cee5a608a045dca024c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 18:21:51 2019 +0100
Upgrade to Maven Surefire Plugin 3.0.0-M3
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 873f87c..585acc3 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -79,7 +79,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-compiler-plugin:3.8.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test
</test>
<package>
org.apache.maven.plugins:maven-jar-plugin:2.4:jar
[maven] 02/06: Upgrade to Maven Compiler Plugin 3.8.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit fa41fd7cee67f9309202dbc489dbd11f60a1ccd7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 16:11:20 2019 +0100
Upgrade to Maven Compiler Plugin 3.8.1
---
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 5bbb427..873f87c 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -70,13 +70,13 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile
</compile>
<process-test-resources>
org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.8.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test