From 2909b5a329fd946796428a8e7f46034bc3bcbd2f Mon Sep 17 00:00:00 2001
From: Igor Fedorenko <ifedorenko@apache.org>
Date: Wed, 27 Aug 2014 23:17:24 -0400
Subject: [PATCH] aether 1.0

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
---
 apache-maven/pom.xml          | 6 +++++-
 maven-aether-provider/pom.xml | 8 +++++++-
 maven-compat/pom.xml          | 7 ++++++-
 pom.xml                       | 9 +++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8b89c50c6a..f50cce75d7 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -87,7 +87,11 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-connector-wagon</artifactId>
+      <artifactId>aether-connector-basic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-transport-wagon</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 9c1569ef15..16e2f647b5 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -91,7 +91,12 @@ under the License.
     <!-- Testing -->
     <dependency>
       <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-connector-wagon</artifactId>
+      <artifactId>aether-connector-basic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-transport-wagon</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -122,3 +127,4 @@ under the License.
   </build>
 
 </project>
+
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 74d92466ba..b2e0638d39 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -79,7 +79,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-connector-wagon</artifactId>
+      <artifactId>aether-connector-basic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-transport-wagon</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 75671d8937..5c785fefae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
     <cipherVersion>1.7</cipherVersion>
     <modelloVersion>1.8.1</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <aetherVersion>0.9.0.M2</aetherVersion>
+    <aetherVersion>1.0.0.v20140518</aetherVersion>
     <slf4jVersion>1.7.5</slf4jVersion>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <!-- Control the name of the distribution and information output by mvn -->
@@ -308,7 +308,12 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.aether</groupId>
-        <artifactId>aether-connector-wagon</artifactId>
+        <artifactId>aether-connector-basic</artifactId>
+        <version>${aetherVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.aether</groupId>
+        <artifactId>aether-transport-wagon</artifactId>
         <version>${aetherVersion}</version>
       </dependency>
       <!--  Commons -->