From 77b5ad1b0b59916be12240831604e91a8ea31873 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Tue, 22 Oct 2013 11:05:24 -0500
Subject: [PATCH] Update to Spring Security Snapshot

---
 .../actuate/autoconfigure/SecurityAutoConfiguration.java  | 8 ++++----
 spring-boot-dependencies/pom.xml                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
index 527b42f607..cb84c55e94 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
@@ -57,7 +57,7 @@ import org.springframework.security.config.annotation.web.configurers.HeadersCon
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
 import org.springframework.security.web.header.writers.HstsHeaderWriter;
-import org.springframework.security.web.util.AnyRequestMatcher;
+import org.springframework.security.web.util.matcher.AnyRequestMatcher;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or
@@ -299,10 +299,10 @@ public class SecurityAutoConfiguration {
 		private SecurityProperties security;
 
 		@Bean
-		public AuthenticationManager authenticationManager() throws Exception {
+		public AuthenticationManager authenticationManager(ObjectPostProcessor<Object> objectPostProcessor) throws Exception {
 
 			InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> builder = new AuthenticationManagerBuilder(
-					ObjectPostProcessor.QUIESCENT_POSTPROCESSOR).inMemoryAuthentication();
+					objectPostProcessor).inMemoryAuthentication();
 			User user = this.security.getUser();
 
 			if (user.isDefaultPassword()) {
@@ -327,7 +327,7 @@ public class SecurityAutoConfiguration {
 		if (headers.getHsts() != Headers.HSTS.none) {
 			boolean includeSubdomains = headers.getHsts() == Headers.HSTS.all;
 			HstsHeaderWriter writer = new HstsHeaderWriter(includeSubdomains);
-			writer.setRequestMatcher(new AnyRequestMatcher());
+			writer.setRequestMatcher(AnyRequestMatcher.INSTANCE);
 			configurer.addHeaderWriter(writer);
 		}
 		if (headers.isContentType()) {
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index a55141deda..b1453a4429 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -34,7 +34,7 @@
 		<snakeyaml.version>1.12</snakeyaml.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
-		<spring-security.version>3.2.0.RC1</spring-security.version>
+		<spring-security.version>3.2.0.CI-SNAPSHOT</spring-security.version>
 		<spring-integration.version>2.2.4.RELEASE</spring-integration.version>
 		<spring-integration-groovydsl.version>1.0.0.M1</spring-integration-groovydsl.version>
 		<spring-batch.version>2.2.0.RELEASE</spring-batch.version>