From 19d8315639544867a65072846959958ad80e1bb7 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 23 May 2013 14:22:08 +0100 Subject: [PATCH] Update for Spring Security snapshot --- .../actuate/autoconfigure/SecurityConfiguration.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java index 003ea64de15..d805191c4ab 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java @@ -28,9 +28,9 @@ import org.springframework.security.authentication.AuthenticationEventPublisher; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.config.annotation.authentication.AuthenticationBuilder; +import org.springframework.security.config.annotation.authentication.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.EnableWebSecurity; -import org.springframework.security.config.annotation.web.HttpConfigurator; +import org.springframework.security.config.annotation.web.HttpConfiguration; import org.springframework.security.config.annotation.web.WebSecurityConfiguration; import org.springframework.security.config.annotation.web.WebSecurityConfigurerAdapter; @@ -70,7 +70,7 @@ public class SecurityConfiguration { private AuthenticationEventPublisher authenticationEventPublisher; @Override - protected void configure(HttpConfigurator http) throws Exception { + protected void configure(HttpConfiguration http) throws Exception { http.antMatcher("/**").httpBasic().and().anonymous().disable(); if (this.security.isRequireSsl()) { http.requiresChannel().antMatchers("/**").requiresSecure(); @@ -101,8 +101,9 @@ public class SecurityConfiguration { @Bean public AuthenticationManager authenticationManager() throws Exception { - return new AuthenticationBuilder().inMemoryAuthentication().withUser("user") - .password("password").roles("USER").and().and().build(); + return new AuthenticationManagerBuilder().inMemoryAuthentication() + .withUser("user").password("password").roles("USER").and().and() + .build(); } }