diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-05-19 22:20:55 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-05-19 22:20:55 +0000 |
| commit | c96411890abc41e512583e409ea06715b6ddb84e (patch) | |
| tree | 40dc3029619d30e31b32cbb9e29056543a00992b /pom.xml | |
| parent | 34d5a62c41d332ba6683c4f68082068946b2d762 (diff) | |
| download | archiva-c96411890abc41e512583e409ea06715b6ddb84e.tar.gz archiva-c96411890abc41e512583e409ea06715b6ddb84e.zip | |
[MRM-1473] remove use of plexus-spring
start some changes on archiva-configuration and archiva-security
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125142 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 76 |
1 files changed, 43 insertions, 33 deletions
@@ -90,6 +90,11 @@ <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> <exclude>plexus:plexus-utils</exclude> <exclude>com.google.code.atinject:atinject</exclude> + <exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude> + <exclude>org.codehaus.plexus.cache:plexus-cache-ehcache</exclude> + <exclude>net.sf.ehcache:ehcache</exclude> + <exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude> + <exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude> </excludes> </bannedDependencies> </rules> @@ -207,7 +212,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.8.1</version> <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> + <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> </configuration> </plugin> <plugin> @@ -749,26 +754,14 @@ <version>1.5.5</version> </dependency> <dependency> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-api</artifactId> - <version>1.0-alpha-2</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <groupId>org.codehaus.redback.components.cache</groupId> + <artifactId>spring-cache-api</artifactId> + <version>1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus.cache</groupId> - <artifactId>plexus-cache-ehcache</artifactId> - <version>1.0-alpha-2</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <groupId>org.codehaus.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <version>1.0-SNAPSHOT</version> </dependency> <!-- redback --> @@ -907,20 +900,14 @@ <!-- redback --> <dependency> - <groupId>org.codehaus.plexus.registry</groupId> - <artifactId>plexus-registry-api</artifactId> - <version>1.0-alpha-2</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <groupId>org.codehaus.redback.components.registry</groupId> + <artifactId>spring-registry-api</artifactId> + <version>1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus.registry</groupId> - <artifactId>plexus-registry-commons</artifactId> - <version>1.0-alpha-2</version> + <groupId>org.codehaus.redback.components.registry</groupId> + <artifactId>spring-registry-commons</artifactId> + <version>1.0-SNAPSHOT</version> <exclusions> <exclusion> <groupId>ant</groupId> @@ -1153,6 +1140,28 @@ </dependency> --> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> <version>1.0</version> @@ -1202,8 +1211,8 @@ </dependency> <dependency> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.3.0</version> + <artifactId>ehcache-core</artifactId> + <version>2.4.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1231,6 +1240,7 @@ <spring.version>3.0.5.RELEASE</spring.version> <jackrabbit.version>2.2.5</jackrabbit.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> </properties> <profiles> <profile> |