SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0.x' into 3.1.x

Browse Source 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context-webflux-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter-bootstrap/pom.xml
#	spring-cloud-starter-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2022-07-01 15:15:40 +02:00
parent dc2dc34583 e72fc6c690
commit 12efda3e5c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@@ -28,7 +28,8 @@
<properties>
<bintray.package>commons</bintray.package>
<evictor.version>1.0.0</evictor.version>
<spring-security-oauth2-autoconfigure.version>2.4.3</spring-security-oauth2-autoconfigure.version>
<!-- Deprecated - reached EOL -->
<spring-security-oauth2-autoconfigure.version>2.5.2</spring-security-oauth2-autoconfigure.version>
</properties>
<build>
<plugins>

1
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfiguration.java
View File

@@ -40,6 +40,7 @@ import org.springframework.security.oauth2.client.OAuth2RestTemplate;
@ConditionalOnClass(OAuth2RestTemplate.class)
@ConditionalOnProperty("spring.cloud.oauth2.load-balanced.enabled")
@AutoConfigureAfter(OAuth2AutoConfiguration.class)
@Deprecated // spring-security-oauth2 reached EOL
public class OAuth2LoadBalancerClientAutoConfiguration {
@Configuration(proxyBeanMethods = false)