Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2015-03-18 11:18:53 +00:00

View File

@@ -158,7 +158,7 @@ public class EndpointWebMvcChildContextConfiguration {
* configures the security filter.
*/
@Configuration
@ConditionalOnMissingClass(WebSecurityConfigurerAdapter.class)
@ConditionalOnMissingClass(name = "org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter")
protected static class EndpointHandlerMappingConfiguration {
@Autowired(required = false)