Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > 9257054efe39320187b0b08dddddc921 > files > 3

maven-3.2.2-3.mga5.src.rpm

From ff559645842bf21e3bfee6810ed2808657120396 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 12 Aug 2013 08:49:19 +0200
Subject: [PATCH 3/4] Update Aether to 0.9.0.M3

---
 apache-maven/pom.xml          | 6 +++++-
 maven-aether-provider/pom.xml | 7 ++++++-
 maven-compat/pom.xml          | 7 ++++++-
 pom.xml                       | 9 +++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 738c6e5..9c77d18 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-transport-wagon</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-connector-basic</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 74a7c71..ed264ab 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>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index be2a927..afeab8c 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-transport-wagon</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-connector-basic</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 760e6c2..148b8ce 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>0.9.0.M3</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 -->
-- 
1.9.3