Merge branch '2.2.x'

.gitignore

@@ -19,4 +19,5 @@ _site/
 .factorypath
 *.versionsBackup
 .vscode/
-.flattened-pom.xml
+.flattened-pom.xml
+.sdkmanrc

README.adoc

@@ -18,6 +18,8 @@ Spring Boot and Spring Security OAuth2 we can quickly create systems that
 implement common patterns like single sign on, token relay and token
 exchange.
 
+WARNING: In a future major release, the functionality contained in this project will move to the respective projects.
+
 == Upgrading to 1.1.0
 
 Most of the OAuth2 features moved from this project to Spring Boot 1.3, so from version 1.1 things are a little different here. Here

docs/pom.xml

@@ -34,19 +34,21 @@
 						<artifactId>maven-dependency-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
 					<plugin>

docs/src/main/asciidoc/intro.adoc

@@ -7,3 +7,5 @@ easy to use in a service platform like Cloud Foundry. Building on
 Spring Boot and Spring Security OAuth2 we can quickly create systems that
 implement common patterns like single sign on, token relay and token
 exchange.
+
+WARNING: In a future major release, the functionality contained in this project will move to the respective projects.

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/SpringCloudSecurityAutoConfiguration.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.security.oauth2;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Spencer Gibb
+ * @since 2.2.2
+ * @deprecated All modules and starters are deprecated as of 2.2.2, in the next major
+ * release, functionality will moved to specific projects (feign or gateway).
+ */
+@Configuration(proxyBeanMethods = false)
+@Deprecated
+public class SpringCloudSecurityAutoConfiguration {
+
+	private static final Log LOG = LogFactory
+			.getLog(SpringCloudSecurityAutoConfiguration.class);
+
+	public SpringCloudSecurityAutoConfiguration() {
+		LOG.warn("All Spring Cloud Security modules and starters are deprecated. "
+				+ "They will be moved to individual projects in the next major release.");
+	}
+
+}

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/client/AccessTokenContextRelay.java

@@ -36,6 +36,7 @@
  * @author Dave Syer
  *
  */
+@Deprecated
 public class AccessTokenContextRelay {
 
 	private OAuth2ClientContext context;

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/client/OAuth2LoadBalancerClientAutoConfiguration.java

@@ -41,6 +41,7 @@
 @ConditionalOnProperty(value = "security.oauth2.resource.loadBalanced",
 		matchIfMissing = false)
 @AutoConfigureAfter(OAuth2AutoConfiguration.class)
+@Deprecated
 public class OAuth2LoadBalancerClientAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/client/ResourceServerTokenRelayAutoConfiguration.java

@@ -65,6 +65,7 @@
 @ConditionalOnOAuth2ClientInResourceServer
 @ConditionalOnClass(ResourceServerConfiguration.class)
 @ConditionalOnWebApplication
+@Deprecated
 public class ResourceServerTokenRelayAutoConfiguration {
 
 	@Bean

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/client/feign/OAuth2FeignRequestInterceptor.java

@@ -39,9 +39,11 @@
  * {@link OAuth2ClientContext OAuth2ClientContext} provided from the environment and
  * construct a new header on the request before it is made by Feign.
  *
+ * @deprecated will move to Spring Cloud Openfeign in next major release.
  * @author Joao Pedro Evangelista
  * @author Tim Ysewyn
  */
+@Deprecated
 public class OAuth2FeignRequestInterceptor implements RequestInterceptor {
 
 	/**

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/gateway/TokenRelayAutoConfiguration.java

@@ -36,6 +36,7 @@
 @ConditionalOnClass({ GatewayFilter.class, OAuth2AuthorizedClient.class,
 		SecurityWebFilterChain.class, SecurityProperties.class })
 @ConditionalOnWebApplication
+@Deprecated
 public class TokenRelayAutoConfiguration {
 
 	@Bean

spring-cloud-security/src/main/java/org/springframework/cloud/security/oauth2/gateway/TokenRelayGatewayFilterFactory.java

@@ -29,8 +29,10 @@
 
 /**
  * @author Joe Grandja
+ * @deprecated will move to Spring Cloud Gateway in next major release.
  */
 @Component
+@Deprecated
 public class TokenRelayGatewayFilterFactory extends AbstractGatewayFilterFactory<Object> {
 
 	private ServerOAuth2AuthorizedClientRepository authorizedClientRepository;

spring-cloud-security/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,6 @@
 # Autoconfig
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.security.oauth2.SpringCloudSecurityAutoConfiguration,\
 org.springframework.cloud.security.oauth2.gateway.TokenRelayAutoConfiguration,\
 org.springframework.cloud.security.oauth2.client.OAuth2LoadBalancerClientAutoConfiguration,\
 org.springframework.cloud.security.oauth2.client.ResourceServerTokenRelayAutoConfiguration