From 06a48e4a003f96b8cbf4a53cd0077aad0593e7e5 Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Thu, 14 Mar 2013 18:04:55 +0800
Subject: [PATCH] migrate to Spring 3.2.2

---
 pom.xml | 64 +--------------------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5bb290527..781d21945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.7.2</slf4j.version>
         <spring-data-jpa.version>1.3.0.RELEASE</spring-data-jpa.version>
-        <spring-framework.version>3.2.1.RELEASE</spring-framework.version>
+        <spring-framework.version>3.2.2.RELEASE</spring-framework.version>
         <validation.version>1.0.0.GA</validation.version>
         <webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
         <webjars-jquery-ui.version>1.9.2</webjars-jquery-ui.version>
@@ -82,10 +82,6 @@
 
     <dependencies>
         <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -386,59 +382,6 @@
 		        <path>/petclinic</path>
 		      </configuration>
 		    </plugin> 
-
-
-            <!-- *******************************************************
-                gDickens: For reliable builds, ensure:
-                 * NO duplicate jars of differing versions
-                 * NO old versions of logging and Spring are included directly or Transitively
-                 * All plugins have the version included as per Maven
-                 * Legacy jars that have been replaced (javassist, should be org.javassist, etc)
-                ************************************************************ -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven-enforcer-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <!-- Ensure no conflicting jar versions -->
-                                <requireUpperBoundDeps/>
-                                <requirePluginVersions/>
-                                <dependencyConvergence/>
-                                <bannedDependencies>
-                                    <searchTransitive>true</searchTransitive>
-                                    <excludes>
-                                        <exclude>javassist</exclude>
-                                        <exclude>commons-logging</exclude>
-                                        <exclude>aspectj</exclude>
-                                        <exclude>asm</exclude>
-                                        <exclude>hsqldb</exclude>
-                                        <exclude>log4j</exclude>
-                                        <exclude>org.slf4j:1.5*</exclude>
-                                        <exclude>org.slf4j:1.6*</exclude>
-                                        <exclude>org.springframework:spring:2.*</exclude>
-                                        <exclude>org.springframework:spring*:3.0.*</exclude>
-                                        <exclude>org.springframework:spring*:3.1.*</exclude>
-                                    </excludes>
-                                </bannedDependencies>
-                                <requireMavenVersion>
-                                    <version>${maven.version.range}</version>
-                                </requireMavenVersion>
-                                <requireJavaVersion>
-                                    <version>${java.version}</version>
-                                </requireJavaVersion>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -657,11 +600,6 @@
                 <artifactId>spring-beans</artifactId>
                 <version>${spring-framework.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${spring-framework.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jdbc</artifactId>