aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-12-13 21:53:26 +0000
committerOlivier Lamy <olamy@apache.org>2011-12-13 21:53:26 +0000
commit67e313f68162041def93e12f12df1c15bfaca599 (patch)
treecbfa4f571cf002acf9c080bde30fba7b02d5fdc5 /pom.xml
parent9c7358fd42154e5266ea5ebb931d2c6e1e13e88e (diff)
downloadarchiva-67e313f68162041def93e12f12df1c15bfaca599.tar.gz
archiva-67e313f68162041def93e12f12df1c15bfaca599.zip
[MRM-1564] spring 3.1.0 upgrade
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1213948 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 13edda199..2b57aa84b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<redback.taskqueue.version>1.0</redback.taskqueue.version>
<slf4j.version>1.6.4</slf4j.version>
<binder.version>0.11</binder.version>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <spring.version>3.1.0.RELEASE</spring.version>
<jackrabbit.version>2.3.4</jackrabbit.version>
<javax.jcr.version>2.0</javax.jcr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -1339,6 +1339,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-expression</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-test</artifactId>
<version>${spring.version}</version>
<exclusions>