From: Olivier Lamy <olamy@apache.org>
Date: Wed, 19 Dec 2012 15:19:02 +0000 (+0000)
Subject: spring 3.2.0
X-Git-Tag: archiva-1.4-M4~461
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=31438032029fe54269ae1b349d40f49d8c73c5d3;p=archiva.git

spring 3.2.0

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1423877 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index abc083548..d401608f4 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -41,10 +41,10 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 201468a3a..18eca9ff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <slf4j.version>1.7.2</slf4j.version>
     <log4j.version>2.0-beta3</log4j.version>
 
-    <spring.version>3.1.3.RELEASE</spring.version>
+    <spring.version>3.2.0.RELEASE</spring.version>
 
     <javax.jcr.version>2.0</javax.jcr.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -1357,7 +1357,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
+      <!--dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-asm</artifactId>
         <version>${spring.version}</version>
@@ -1367,7 +1367,7 @@
             <artifactId>commons-logging</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>
+      </dependency-->
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>