Upgraded springframework to version 4.0.6.RELEASE

[website] / pom.xml

diff --git a/pom.xml b/pom.xml
index b9e7a1b..af8665d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <jstl.version>1.2</jstl.version>
     <servlet-api.version>3.0.1</servlet-api.version>
     <slf4j.version>1.5.8</slf4j.version>
-    <springframework.version>3.2.4.RELEASE</springframework.version>
+    <springframework.version>4.0.6.RELEASE</springframework.version>
     <tiles.version>3.0.1</tiles.version>
     <wro4j.version>1.7.3-SNAPSHOT</wro4j.version>
 
@@ -57,6 +57,12 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>${springframework.version}</version>
+      <exclusions>
+        <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Tiles -->