Repository: maven Updated Branches: refs/heads/DEPMGMT-INCLUDE-IT fb65d6fab -> d109fcf12 (forced update)
[MNG-6110] Upgrade Aether to Maven Resolver 1.0.3 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4d6c9292 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4d6c9292 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4d6c9292 Branch: refs/heads/DEPMGMT-INCLUDE-IT Commit: 4d6c9292c433626fa0b9a1cf711d4d0c366e7f33 Parents: a3cdfbb Author: Harald Wellmann <harald.wellm...@gmx.de> Authored: Sun Nov 6 12:13:32 2016 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Wed Feb 1 07:59:52 2017 +0100 ---------------------------------------------------------------------- apache-maven/pom.xml | 8 ++++---- maven-aether-provider/pom.xml | 26 ++++++++++++------------- maven-compat/pom.xml | 24 +++++++++++++++++++---- maven-core/pom.xml | 16 ++++++++++------ maven-embedder/pom.xml | 8 ++++++++ pom.xml | 39 +++++++++++++++++++------------------- 6 files changed, 75 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index e7d5608..6fc5a73 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -90,12 +90,12 @@ under the License. <artifactId>wagon-file</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-connector-basic</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-connector-basic</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-transport-wagon</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/maven-aether-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 0f3cb61..91d1ae7 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -31,7 +31,7 @@ under the License. <artifactId>maven-aether-provider</artifactId> <name>Maven Aether Provider</name> - <description>Extensions to Aether for utilizing Maven POM and repository metadata.</description> + <description>Extensions to Maven Resolver for utilizing Maven POM and repository metadata.</description> <dependencies> <dependency> @@ -47,20 +47,20 @@ under the License. <artifactId>maven-repository-metadata</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-spi</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-spi</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-impl</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -88,13 +88,13 @@ under the License. </dependency> <!-- Testing --> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-connector-basic</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-connector-basic</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-transport-wagon</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 3a0a45c..876c11c 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -59,6 +59,22 @@ under the License. <artifactId>maven-core</artifactId> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> @@ -85,13 +101,13 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-connector-basic</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-connector-basic</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-transport-wagon</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index d147dd8..ad5484a 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -73,16 +73,20 @@ under the License. <artifactId>maven-aether-provider</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-impl</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-spi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 75b92c9..30ad2ce 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -51,6 +51,14 @@ under the License. <artifactId>maven-model-builder</artifactId> </dependency> <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> <scope>runtime</scope> http://git-wip-us.apache.org/repos/asf/maven/blob/4d6c9292/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b61e0af..0e3b9a7 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. <cipherVersion>1.7</cipherVersion> <modelloVersion>1.8.3</modelloVersion> <jxpathVersion>1.3</jxpathVersion> - <aetherVersion>1.0.2.v20150114</aetherVersion> + <resolverVersion>1.0.3</resolverVersion> <slf4jVersion>1.7.5</slf4jVersion> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <!-- Control the name of the distribution and information output by mvn --> @@ -328,34 +328,34 @@ under the License. </dependency> <!-- Repository --> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${resolverVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-spi</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-spi</artifactId> + <version>${resolverVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-impl</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> + <version>${resolverVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${resolverVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-connector-basic</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-connector-basic</artifactId> + <version>${resolverVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-transport-wagon</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> + <version>${resolverVersion}</version> </dependency> <!-- Commons --> <dependency> @@ -639,6 +639,7 @@ under the License. <notimestamp>true</notimestamp> <quiet>true</quiet> <links combine.children="append"> + <!-- TODO link to Maven Resolver Javadoc --> <link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link> <link>https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/</link> </links>
