Repository: maven Updated Branches: refs/heads/master 8e0b9838a -> 47ff8321f
[MNG-6110] Upgrade Aether to Maven Resolver 1.2 This closes #95 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/47ff8321 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/47ff8321 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/47ff8321 Branch: refs/heads/master Commit: 47ff8321fc7a0f423178708ddf35e3f97258e5ea Parents: 8e0b983 Author: Harald Wellmann <harald.wellm...@gmx.de> Authored: Sun Nov 6 12:13:32 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Dec 10 23:05:27 2016 +0100 ---------------------------------------------------------------------- apache-maven/pom.xml | 8 ++++---- maven-aether-provider/pom.xml | 26 ++++++++++++------------- maven-compat/pom.xml | 20 +++++++++---------- maven-core/pom.xml | 16 ++++++++-------- maven-embedder/pom.xml | 8 ++++---- pom.xml | 39 +++++++++++++++++++------------------- 6 files changed, 59 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/47ff8321/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 437fc43..222e98f 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -84,12 +84,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/47ff8321/maven-aether-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 9d7cfd5..4579ae5 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> @@ -104,13 +104,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/47ff8321/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 9588dd2..907310d 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -71,16 +71,16 @@ under the License. <artifactId>maven-aether-provider</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-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> @@ -109,13 +109,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/47ff8321/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index adf63a6..baaee8e 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -77,20 +77,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-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.apache.maven.shared</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/47ff8321/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index db1bb34..4493f5f 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -63,12 +63,12 @@ under the License. <artifactId>maven-model-builder</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-util</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/47ff8321/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a23683d..5a02403 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,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.2.0-SNAPSHOT</resolverVersion> <!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). --> <!-- https://issues.apache.org/jira/browse/MNG-6023 --> <!-- http://jira.qos.ch/browse/SLF4J-370 --> @@ -367,34 +367,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> @@ -688,6 +688,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>
