You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/03/18 21:27:51 UTC
[2/7] git commit: Reverting some unexpected aether dependency changes
to the top-level pom which broke the build
Reverting some unexpected aether dependency changes to the top-level pom which broke the build
Signed-off-by: Jason van Zyl <ja...@tesla.io>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4849df91
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4849df91
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4849df91
Branch: refs/heads/eclipse-aether
Commit: 4849df9183bb2c03b49f0a71c48943dbfdb0a32e
Parents: cf4d0be
Author: Stuart McCulloch <mc...@gmail.com>
Authored: Fri Mar 15 22:46:57 2013 +0000
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Fri Mar 15 16:46:28 2013 -0700
----------------------------------------------------------------------
pom.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4849df91/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f443fa..aab1179 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,8 @@
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
+ <aetherVersion>1.13.1</aetherVersion>
<slf4jVersion>1.7.2</slf4jVersion>
- <aetherVersion>0.9.0.M2</aetherVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -264,29 +264,39 @@
</dependency>
<!-- Repository -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.sonatype.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>${aetherVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Commons -->
<dependency>