From 6fd6afc7a3cfc713d1fe1fccbccb4537fdce269d Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Thu, 18 Jul 2013 13:36:27 +0100
Subject: [PATCH] Upgrade Spring Security to 3.2.0

Existing users should update their dependencies to
spring-security-config instead of *-javaconfig.

[Fixes #53472823] [bs-234]
---
 pom.xml                                                    | 7 +++----
 spring-actuator/pom.xml                                    | 4 ++--
 spring-starters/spring-starter-security/pom.xml            | 2 +-
 spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml | 2 +-
 spring-zero-samples/spring-zero-sample-actuator/pom.xml    | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 255f26d5204..d0f6f4e65a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.version>3.0.5</maven.version>
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
-		<spring.security.version>3.1.3.RELEASE</spring.security.version>
-		<spring.security.javaconfig.version>1.0.0.CI-SNAPSHOT</spring.security.javaconfig.version>
+		<spring.security.version>3.2.0.M2</spring.security.version>
 		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
 		<tomcat.version>7.0.42</tomcat.version>
@@ -595,8 +594,8 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
-				<artifactId>spring-security-javaconfig</artifactId>
-				<version>${spring.security.javaconfig.version}</version>
+				<artifactId>spring-security-config</artifactId>
+				<version>${spring.security.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
diff --git a/spring-actuator/pom.xml b/spring-actuator/pom.xml
index 65b4a208bc9..97ac2466dc6 100644
--- a/spring-actuator/pom.xml
+++ b/spring-actuator/pom.xml
@@ -53,12 +53,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
+			<artifactId>spring-security-web</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-web</artifactId>
+			<artifactId>spring-security-config</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-starters/spring-starter-security/pom.xml b/spring-starters/spring-starter-security/pom.xml
index f013befc7d3..c1afc93055a 100644
--- a/spring-starters/spring-starter-security/pom.xml
+++ b/spring-starters/spring-starter-security/pom.xml
@@ -20,7 +20,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
+			<artifactId>spring-security-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
index 019bb1b0983..d4715292f2f 100644
--- a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
@@ -25,7 +25,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
+			<artifactId>spring-security-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
diff --git a/spring-zero-samples/spring-zero-sample-actuator/pom.xml b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
index 4471f9624f8..5b7c8193444 100644
--- a/spring-zero-samples/spring-zero-sample-actuator/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
@@ -38,7 +38,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
+			<artifactId>spring-security-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>