diff options
| author | Brett Porter <brett@apache.org> | 2014-01-27 13:24:23 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2014-01-27 13:24:23 +0000 |
| commit | 5a3e98c7e76189660e3f5c42e0dcf841eb7c9a6a (patch) | |
| tree | bd478123b17e7de8be901871634bc7c5f40b68a4 /pom.xml | |
| parent | 9182d4eba284e42ae5d1af12c050f92b24b9158a (diff) | |
| download | archiva-5a3e98c7e76189660e3f5c42e0dcf841eb7c9a6a.tar.gz archiva-5a3e98c7e76189660e3f5c42e0dcf841eb7c9a6a.zip | |
upgrade Redback, Struts
Had to remove some validation unit tests that used a deprecated API. This is
covered by the functional tests instead.
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1561667 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 35 |
1 files changed, 17 insertions, 18 deletions
@@ -86,6 +86,7 @@ <exclude>xom:xom</exclude> <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> <exclude>plexus:plexus-utils</exclude> + <exclude>org.codehaus.plexus:plexus-spring</exclude> </excludes> </bannedDependencies> </rules> @@ -449,15 +450,9 @@ <version>1.3.7-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.redback</groupId> <artifactId>plexus-spring</artifactId> - <version>1.2</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> + <version>${redback.version}</version> </dependency> <dependency> <groupId>stax</groupId> @@ -882,7 +877,7 @@ <dependency> <groupId>opensymphony</groupId> <artifactId>sitemesh</artifactId> - <version>2.2.1</version> + <version>2.4.2</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -942,7 +937,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.0.14</version> + <version>${struts.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -953,7 +948,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> - <version>2.0.14</version> + <version>${struts.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -962,6 +957,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts.version}</version> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>1.0</version> @@ -1020,7 +1020,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <artifactId>spring-core</artifactId> <version>${spring.version}</version> <exclusions> <exclusion> @@ -1031,7 +1031,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> + <artifactId>spring-web</artifactId> <version>${spring.version}</version> <exclusions> <exclusion> @@ -1040,11 +1040,10 @@ </exclusion> </exclusions> </dependency> - <!-- use spring test in xmlrpc? <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>2.5.1</version> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1052,7 +1051,6 @@ </exclusion> </exclusions> </dependency> - --> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> @@ -1101,7 +1099,8 @@ <properties> <maven.version>2.0.8</maven.version> <wagon.version>1.0-beta-5</wagon.version> - <redback.version>1.2.9</redback.version> + <redback.version>1.3-M3</redback.version> + <struts.version>2.3.16</struts.version> <jetty.version>6.1.19</jetty.version> <slf4j.version>1.5.8</slf4j.version> <binder.version>0.9</binder.version> |