Commit 8ecb659a authored by Phillip Webb's avatar Phillip Webb

Deprecate SecurityPrerequisite

Deprecate `SecurityPrerequisite` interface since we don't support it
in Spring Boot 2.

Closes gh-14846
parent cd1c2638
...@@ -18,7 +18,6 @@ package org.springframework.boot.actuate.autoconfigure.web.server; ...@@ -18,7 +18,6 @@ package org.springframework.boot.actuate.autoconfigure.web.server;
import java.net.InetAddress; import java.net.InetAddress;
import org.springframework.boot.autoconfigure.security.SecurityPrerequisite;
import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.context.properties.NestedConfigurationProperty;
...@@ -36,7 +35,7 @@ import org.springframework.util.StringUtils; ...@@ -36,7 +35,7 @@ import org.springframework.util.StringUtils;
* @see ServerProperties * @see ServerProperties
*/ */
@ConfigurationProperties(prefix = "management.server", ignoreUnknownFields = true) @ConfigurationProperties(prefix = "management.server", ignoreUnknownFields = true)
public class ManagementServerProperties implements SecurityPrerequisite { public class ManagementServerProperties {
/** /**
* Management endpoint HTTP port (uses the same port as the application by default). * Management endpoint HTTP port (uses the same port as the application by default).
......
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -21,7 +21,9 @@ package org.springframework.boot.autoconfigure.security; ...@@ -21,7 +21,9 @@ package org.springframework.boot.autoconfigure.security;
* configuration is evaluated. * configuration is evaluated.
* *
* @author Dave Syer * @author Dave Syer
* @deprecated since 2.0.6 since security prerequisites are not supported in Spring Boot 2
*/ */
@Deprecated
public interface SecurityPrerequisite { public interface SecurityPrerequisite {
} }
...@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; ...@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
* @author Madhura Bhave * @author Madhura Bhave
*/ */
@ConfigurationProperties(prefix = "spring.security") @ConfigurationProperties(prefix = "spring.security")
public class SecurityProperties implements SecurityPrerequisite { public class SecurityProperties {
/** /**
* Order applied to the WebSecurityConfigurerAdapter that is used to configure basic * Order applied to the WebSecurityConfigurerAdapter that is used to configure basic
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment