[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/3118657e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3118657e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3118657e Branch: refs/heads/MNG-6006 Commit: 3118657e34ec21e14549199649f1982fa11e1665 Parents: 5077f22 Author: Christian Schulte <schu...@apache.org> Authored: Fri Jun 10 16:50:33 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Jun 29 05:24:57 2016 +0200 ---------------------------------------------------------------------- apache-maven/pom.xml | 6 +++--- maven-aether-provider/pom.xml | 14 +++++++------- maven-artifact/pom.xml | 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 12 ++++++------ maven-core/pom.xml | 10 +++++----- maven-embedder/pom.xml | 6 +++--- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 16 ++++++++-------- 14 files changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index ec11cc2..75fe35b 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>apache-maven</artifactId> @@ -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/3118657e/maven-aether-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 9d7cfd5..7a77ed9 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-aether-provider</artifactId> @@ -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> @@ -104,12 +104,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/3118657e/maven-artifact/pom.xml ---------------------------------------------------------------------- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 503e097..e3943c9 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-artifact</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-builder-support/pom.xml ---------------------------------------------------------------------- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 5cc3d8d..2ecb87e 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-builder-support</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 9588dd2..2bcecf8 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-compat</artifactId> @@ -71,15 +71,15 @@ under the License. <artifactId>maven-aether-provider</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> - <groupId>org.eclipse.aether</groupId> + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-impl</artifactId> </dependency> <dependency> @@ -109,12 +109,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/3118657e/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index adf63a6..e5df796 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-core</artifactId> @@ -77,19 +77,19 @@ 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-spi</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/3118657e/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index f9973c5..87372e8 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-embedder</artifactId> @@ -63,11 +63,11 @@ under the License. <artifactId>maven-model-builder</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/3118657e/maven-model-builder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index b6ea3cd..0dd08ac 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-model-builder</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-model/pom.xml ---------------------------------------------------------------------- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 29c454c..41cf168 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-model</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-plugin-api/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index d4fc9af..a8ca3d0 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-plugin-api</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-repository-metadata/pom.xml ---------------------------------------------------------------------- diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 1bef9ef..7480de7 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-repository-metadata</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-settings-builder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index 886031c..2d415c9 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-settings-builder</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-settings/pom.xml ---------------------------------------------------------------------- diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 39b1791..133ee32 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> </parent> <artifactId>maven-settings</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c447507..f850b31 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. </parent> <artifactId>maven</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Maven</name> @@ -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 --> @@ -356,32 +356,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>
