[MNG-6006] Import Aether to Maven codebase
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/36ab263a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/36ab263a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/36ab263a Branch: refs/heads/MNG-6006 Commit: 36ab263a91bbf9d0d083e97fd44aca17f6286ffb Parents: 521e07c Author: Christian Schulte <schu...@apache.org> Authored: Fri Jun 10 16:50:33 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Thu Jun 23 02:55:08 2016 +0200 ---------------------------------------------------------------------- apache-maven/pom.xml | 4 ++-- maven-aether-provider/pom.xml | 12 ++++++------ maven-compat/pom.xml | 4 ++-- maven-core/pom.xml | 6 +++--- pom.xml | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 37751cc..3f8a05a 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -84,11 +84,11 @@ under the License. <artifactId>wagon-file</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-connector-basic</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-transport-wagon</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-aether-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 4c36ebd..87119ea 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -47,19 +47,19 @@ under the License. <artifactId>maven-repository-metadata</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-spi</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-util</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-impl</artifactId> </dependency> <dependency> @@ -92,12 +92,12 @@ under the License. </dependency> <!-- Testing --> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-connector-basic</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-transport-wagon</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index f828d6e..6ca061e 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -85,12 +85,12 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-connector-basic</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-transport-wagon</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index f03eead..640758d 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -73,15 +73,15 @@ under the License. <artifactId>maven-aether-provider</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-impl</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-util</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e53a2ee..9c324d0 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> + <aetherVersion>1.2.0-SNAPSHOT</aetherVersion> <!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). --> <!-- https://issues.apache.org/jira/browse/MNG-6023 --> <!-- http://jira.qos.ch/browse/SLF4J-370 --> @@ -328,32 +328,32 @@ under the License. </dependency> <!-- Repository --> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-api</artifactId> <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-spi</artifactId> <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-impl</artifactId> <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-util</artifactId> <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-connector-basic</artifactId> <version>${aetherVersion}</version> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-transport-wagon</artifactId> <version>${aetherVersion}</version> </dependency>