diff options
| author | Brett Porter <brett@apache.org> | 2011-04-12 13:23:24 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-04-12 13:23:24 +0000 |
| commit | 86ed5afc5c2d795f0ada88bd563d13bd2dde0a92 (patch) | |
| tree | c6a73dd533797d0b0d08a764fd887e156e874d6d /pom.xml | |
| parent | 58d905941b9522e830c6e13b3a850b5cc637679e (diff) | |
| download | archiva-86ed5afc5c2d795f0ada88bd563d13bd2dde0a92.tar.gz archiva-86ed5afc5c2d795f0ada88bd563d13bd2dde0a92.zip | |
[MRM-1111] upgrade to Struts 2.1.8.1
Applied patch and made some additional modifications
Submitted by: Julien Henry, Gwen Harold Autencio
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091398 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -75,6 +75,7 @@ <excludes> <exclude>org.codehaus.plexus:plexus-container-default</exclude> <exclude>org.codehaus.plexus:plexus-log4j-logging</exclude> + <exclude>org.codehaus.plexus:plexus-spring</exclude> <exclude>commons-logging:commons-logging</exclude> <exclude>org.slf4j:jcl104-over-slf4j</exclude> <exclude>velocity:velocity-dep</exclude> @@ -521,9 +522,9 @@ <version>1.4-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.redback</groupId> <artifactId>plexus-spring</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -927,7 +928,7 @@ <dependency> <groupId>opensymphony</groupId> <artifactId>sitemesh</artifactId> - <version>2.2.1</version> + <version>2.4.2</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -987,7 +988,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> @@ -998,7 +999,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> @@ -1183,6 +1184,7 @@ </dependencies> </dependencyManagement> <properties> + <struts.version>2.1.8.1</struts.version> <maven.version>2.0.8</maven.version> <maven3x.version>3.0-alpha-4</maven3x.version> <wagon.version>1.0-beta-5</wagon.version> |