You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/04/04 22:15:53 UTC
[maven] branch MNG-6169/MNG-6551 updated (9f880e5 -> 73677c9)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 9f880e5 Upgrade to Maven Deploy Plugin 3.0.0-M1
discard d4c99bd Upgrade to Maven Install Plugin 3.0.0-M1
discard a0ce69f Upgrade to Maven JAR Plugin 3.1.1
discard 3689281 Upgrade to Maven Surefire Plugin 3.0.0-M3
discard 9ac6d2b Upgrade to Maven Compiler Plugin 3.8.0
discard 32be41e Upgrade to Maven Resources Plugin 3.1.0
add d9facde [MNG-6530] Introduce system property to disable global model cache
add a939654 [MNG-6256] Surround parameter of echo command with double quotes
add 8e5ecf0 fixed link (that goes to implementation in maven-core)
add 375cd7b [MNG-6559] Fix mailing list URL (#230)
add fdf5d92 renamed variables for better understanding
add 396291b [MNG-6069] Migrate to non deprecated parts of Commons CLI (#153)
add 2928dc6 refactoring: extracted initParent() method
add 049b7a7 refactoring: reduced try/catch scope
add ae1c32a [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
add 8b7055f [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
add 27332cf [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
add 24c762d [MNG-6533] catch InvalidArtifactRTException runtime exception
add bb3ec5d [MNG-5995] Remove dependency to maven-compat (#185)
add 7e3e545 [MNG-6573] Use Maven 3.6.0 for CI
add 15c6471 [MNG-6558] ToolchainsBuildingResult event is not sent on EventSpy
add b7249af Revert [MNG-6069] Migrate to non deprecated parts of Commons CLI
add 8f9075d [MNG-6571] cache VersionRange instances, they are immutable
add 6bd8bb9 [MNG-6571] forgot to put new instance in cache
add 657fbb7 Revert "[MNG-6571] forgot to put new instance in cache"
add 961746f [MNG-6571] separate caches for create from spec and version
add 4decfcf [MNG-6591] Upgrade to Wagon 3.3.2
add c674bcf [MNG-6495] ModelResolver cannot be null
add bd4a3a0 [MNG-6593] track input location for super-pom content
add 9dd4732 Revert "[MNG-6548] Lifecycle plugin version upgrades"
add 37676a2 [MNG-6599] use version from parent if necessary, like groupId
add 4bec550 [MNG-6600] add inputlocation tracking for default lifecycle executions
add 0b10fe7 [MNG-6597] add input location tracking for plugins configuration
add 49c8f17 [MNG-6601] add input location tracking for m-site-p converted reports
add f5a1374 [MNG-6572] use int or long instead of BigIntegers for little numbers in ComparableVersion
add 0be2644 [MNG-6538] Upgrade maven-resolver to 1.3.3
add 5306cd0 [MNG-6506] [MNG-6543] Upgrade Plexus Classworlds to 2.6.0
add a7acfe7 [MNG-6611] Update animal-sniffer-maven-plugin to version 1.17
add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode)
add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages
add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1
new f226c77 Upgrade to Maven Resources Plugin 3.1.0
new 8329eaf Upgrade to Maven Compiler Plugin 3.8.0
new 6dee485 Upgrade to Maven Surefire Plugin 3.0.0-M3
new 170cc96 Upgrade to Maven JAR Plugin 3.1.1
new cb9fd99 Upgrade to Maven Install Plugin 3.0.0-M1
new 73677c9 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 (9f880e5)
\
N -- N -- N refs/heads/MNG-6169/MNG-6551 (73677c9)
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:
CONTRIBUTING.md | 4 +-
Jenkinsfile | 8 +-
apache-maven/README.txt | 2 +-
apache-maven/pom.xml | 2 +-
apache-maven/src/bin/mvn.cmd | 4 +-
maven-artifact/pom.xml | 2 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 227 +++++++++++--
.../maven/artifact/versioning/VersionRange.java | 33 +-
.../artifact/versioning/ComparableVersionTest.java | 90 +++++
.../artifact/versioning/VersionRangeTest.java | 19 ++
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 100 +++++-
.../internal/DefaultLifecyclePluginAnalyzer.java | 22 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 14 +-
.../maven/project/DefaultProjectBuilder.java | 367 ++++++++++++---------
.../project/DefaultProjectBuildingHelper.java | 6 +-
.../main/resources/META-INF/maven/extension.xml | 1 +
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../apache/maven/project/ProjectBuilderTest.java | 119 +++++++
.../resources/projects/artifactMissingVersion.xml | 34 ++
.../pom.xml => resources/projects/badPom.xml} | 10 +-
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 3 +
.../main/java/org/apache/maven/cli/MavenCli.java | 8 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 38 +++
maven-model-builder/pom.xml | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 4 +-
.../maven/model/building/ModelProblemUtils.java | 4 +
.../model/plugin/DefaultReportingConverter.java | 54 ++-
.../model/superpom/DefaultSuperPomProvider.java | 11 +-
maven-model-builder/src/site/apt/index.apt | 4 +-
maven-model/pom.xml | 3 +-
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 | 16 +-
42 files changed, 976 insertions(+), 263 deletions(-)
create mode 100644 maven-core/src/test/resources/projects/artifactMissingVersion.xml
copy maven-core/src/test/{projects/default-maven/cyclic-reference/pom.xml => resources/projects/badPom.xml} (53%)
[maven] 02/06: Upgrade to Maven Compiler Plugin 3.8.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8329eaf4299d16161f3637f93e9cd1588e1448ee
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 16:11:20 2019 +0100
Upgrade to Maven Compiler Plugin 3.8.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 5bbb427..e73c5e2 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.0: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.0:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
[maven] 04/06: Upgrade to Maven JAR Plugin 3.1.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 170cc96f9d99f4c64ad299660dfddacb2a2dd19c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 7 18:22:03 2019 +0100
Upgrade to Maven JAR Plugin 3.1.1
---
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 90db044..2157db9 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.1:jar
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.4:install
[maven] 03/06: Upgrade to Maven Surefire Plugin 3.0.0-M3
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6dee485757a492d37d67c8ad10f857fbc55755bc
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 e73c5e2..90db044 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.0: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] 01/06: Upgrade to Maven Resources Plugin 3.1.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f226c779b0c4fac4a8495d64e4f0cc7a9b78b9ea
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] 06/06: Upgrade to Maven Deploy Plugin 3.0.0-M1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 73677c97aed93d4e0ee62b4c1ec8fc9e4e239ba7
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 2bcaf1a..ec81dfc 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] 05/06: Upgrade to Maven Install Plugin 3.0.0-M1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6169/MNG-6551
in repository https://gitbox.apache.org/repos/asf/maven.git
commit cb9fd99155d73b37aa54c6a5705675cf6e74395a
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 2157db9..2bcaf1a 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.1: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