diff options
| author | skygo <skygo@unknown> | 2012-09-14 11:25:44 +0000 |
|---|---|---|
| committer | skygo <skygo@unknown> | 2012-09-14 11:25:44 +0000 |
| commit | 47710933b7bab03a2f9ffab0dec499ec2ea433ba (patch) | |
| tree | ed2a55e9613bbf0c1d79bb8ecde8f521a2d16f9a | |
| parent | 75067def2032846ed3bc4c4cccb5bc2ee6e7b7d8 (diff) | |
| download | archiva-47710933b7bab03a2f9ffab0dec499ec2ea433ba.tar.gz archiva-47710933b7bab03a2f9ffab0dec499ec2ea433ba.zip | |
MRM-1515
remove spring-test from war
remove jaxb (as we are 1.6)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384727 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-base/archiva-configuration/pom.xml | 12 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/pom.xml | 12 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 12 |
3 files changed, 36 insertions, 0 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 281668521..344cefc1c 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -32,10 +32,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>commons-configuration</groupId> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 84ed45085..4fb5f4753 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -730,6 +730,14 @@ <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -794,6 +802,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index e8aa1cb56..27d6fc0e4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -448,6 +448,14 @@ <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -939,6 +947,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> |