diff options
| author | skygo <skygo@unknown> | 2012-09-14 12:34:59 +0000 |
|---|---|---|
| committer | skygo <skygo@unknown> | 2012-09-14 12:34:59 +0000 |
| commit | 35c22b818259bbc87767587b058a912deb627e23 (patch) | |
| tree | 1c4fc1b7c817452ad23695f657d5922a0a15a1bc /archiva-modules/archiva-web | |
| parent | 47710933b7bab03a2f9ffab0dec499ec2ea433ba (diff) | |
| download | archiva-35c22b818259bbc87767587b058a912deb627e23.tar.gz archiva-35c22b818259bbc87767587b058a912deb627e23.zip | |
MRM-1515 ctn'd
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384744 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 27d6fc0e4..8cc67501d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -475,10 +475,22 @@ <dependency> <groupId>org.apache.archiva.redback.components.registry</groupId> <artifactId>spring-registry-api</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components.registry</groupId> <artifactId>spring-registry-commons</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components.cache</groupId> @@ -517,7 +529,7 @@ <exclusion> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - </exclusion> + </exclusion> </exclusions> </dependency> <dependency> @@ -838,6 +850,12 @@ <artifactId>struts2-junit-plugin</artifactId> <scope>test</scope> <version>${struts.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jpox</groupId> |