maven/0001-Update-Aether-to-0.9.0.M3.patch

96 lines
3.2 KiB
Diff
Raw Normal View History

2014-02-11 09:36:06 +00:00
From c9859a031e75d41fb8199ab6dc7f3019f510fc83 Mon Sep 17 00:00:00 2001
2013-08-12 07:28:33 +00:00
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 12 Aug 2013 08:49:19 +0200
2014-02-11 09:36:06 +00:00
Subject: [PATCH 3/4] Update Aether to 0.9.0.M3
2013-08-12 07:28:33 +00:00
---
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
2014-02-11 09:36:06 +00:00
index e79b5a5..7504e24 100644
2013-08-12 07:28:33 +00:00
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
2013-10-07 08:45:52 +00:00
@@ -87,7 +87,11 @@
2013-08-12 07:28:33 +00:00
</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
2014-02-11 09:36:06 +00:00
index 8a5fc78..7ae72f2 100644
2013-08-12 07:28:33 +00:00
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
2013-10-07 08:45:52 +00:00
@@ -91,7 +91,12 @@ under the License.
<!-- Testing -->
2013-08-12 07:28:33 +00:00
<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
2014-02-11 09:36:06 +00:00
index a296c86..a2277b7 100644
2013-08-12 07:28:33 +00:00
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
2013-10-07 08:45:52 +00:00
@@ -79,7 +79,12 @@
2013-08-12 07:28:33 +00:00
</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
2014-02-11 09:36:06 +00:00
index 808924a..366c557 100644
2013-08-12 07:28:33 +00:00
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<cipherVersion>1.7</cipherVersion>
2013-10-07 08:45:52 +00:00
<modelloVersion>1.8.1</modelloVersion>
2013-08-12 07:28:33 +00:00
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>0.9.0.M2</aetherVersion>
+ <aetherVersion>0.9.0.M3</aetherVersion>
2013-10-07 08:45:52 +00:00
<slf4jVersion>1.7.5</slf4jVersion>
2013-08-12 07:28:33 +00:00
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
2014-02-11 09:36:06 +00:00
@@ -288,7 +288,12 @@
2013-08-12 07:28:33 +00:00
</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 -->
--
2014-02-11 09:36:06 +00:00
1.8.4.2
2013-08-12 07:28:33 +00:00