aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-06-15 15:30:53 +0000
committerOlivier Lamy <olamy@apache.org>2011-06-15 15:30:53 +0000
commitb3603c5c4365a15faa46b5c9af4b8bbbac03659a (patch)
tree43fabf4c016612f9c6abb18fbca915e13c381b57 /pom.xml
parentaefe91d87c51a1261b0b04d522c250f2a13a6d24 (diff)
downloadarchiva-b3603c5c4365a15faa46b5c9af4b8bbbac03659a.tar.gz
archiva-b3603c5c4365a15faa46b5c9af4b8bbbac03659a.zip
back to maven2 api for dependency tree
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136082 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml35
1 files changed, 25 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index bddfbe50e..8c6ae6572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
<properties>
<struts.version>2.2.3</struts.version>
<maven3x.version>3.0.3</maven3x.version>
+ <maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-5</wagon.version>
<redback.version>1.3-SNAPSHOT</redback.version>
<jetty.version>6.1.19</jetty.version>
@@ -568,6 +569,7 @@
<artifactId>maven-model-builder</artifactId>
<version>${maven3x.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
@@ -578,6 +580,28 @@
<artifactId>maven-core</artifactId>
<version>${maven3x.version}</version>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
@@ -1083,16 +1107,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven3x.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>${maven3x.version}</version>
- </dependency>
+
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>