diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-05-26 20:52:13 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-05-26 20:52:13 +0000 |
| commit | 1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c (patch) | |
| tree | 6f6ff2e608639c0ff425ade6c7516a7858f30507 /pom.xml | |
| parent | 16714e5e4dc72fa81589ebe23a4cbe49f57be462 (diff) | |
| download | archiva-1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c.tar.gz archiva-1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c.zip | |
[MRM-1473] remove use of plexus-spring
remove all dependencies to plexus-container
use of sisu-inject-plexus (version 2.2.2 with ASL license) for components using maven api components.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128075 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 43 |
1 files changed, 25 insertions, 18 deletions
@@ -77,9 +77,7 @@ <exclude>org.codehaus.plexus:plexus-log4j-logging</exclude> <exclude>org.codehaus.plexus:plexus-spring</exclude> - <!-- <exclude>org.codehaus.redback:plexus-spring</exclude> - --> <exclude>commons-logging:commons-logging</exclude> <exclude>org.slf4j:jcl104-over-slf4j</exclude> <exclude>velocity:velocity-dep</exclude> @@ -89,6 +87,8 @@ <exclude>ant:ant-optional</exclude> <exclude>xom:xom</exclude> <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> + <exclude>org.codehaus.plexus:plexus-component-api</exclude> + <exclude>org.codehaus.plexus:plexus-container-default</exclude> <exclude>plexus:plexus-utils</exclude> <exclude>com.google.code.atinject:atinject</exclude> <exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude> @@ -249,7 +249,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.2</version> <scope>test</scope> </dependency> <dependency> @@ -268,6 +267,12 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>httpunit</groupId> <artifactId>httpunit</artifactId> <version>1.6.2</version> @@ -558,17 +563,24 @@ <artifactId>spring-utils</artifactId> <version>1.0-SNAPSHOT</version> </dependency> + + <!-- + use this layer as some modules need to use maven apis + until we find a better solution + --> + <dependency> - <groupId>org.codehaus.redback.components</groupId> - <artifactId>plexus-spring</artifactId> - <version>1.3-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-plexus</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + <version>3.0.1</version> </dependency> + + <dependency> <groupId>stax</groupId> <artifactId>stax</artifactId> @@ -722,11 +734,6 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - <version>1.0-alpha-22</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> <version>1.1</version> </dependency> @@ -1268,7 +1275,7 @@ <properties> <struts.version>2.1.8.1</struts.version> <maven.version>2.0.8</maven.version> - <maven3x.version>3.0-alpha-4</maven3x.version> + <maven3x.version>3.0.3</maven3x.version> <wagon.version>1.0-beta-5</wagon.version> <redback.version>1.3-SNAPSHOT</redback.version> <jetty.version>6.1.19</jetty.version> |