From a1f99244f55ecb7b8105e15a412357245c7440f9 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Wed, 21 May 2025 10:36:35 -0400 Subject: [PATCH] WIP to upgrade to Spring Boot 3.5.0 --- build.gradle | 2 +- settings.gradle | 2 +- .../credhub/autoconfig/CredHubOAuth2AutoConfiguration.java | 7 +++---- .../autoconfig/CredHubTemplateAutoConfiguration.java | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 18e012b..8494cc3 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { description = "Spring CredHub" ext { - springBootVersion = "3.4.5" + springBootVersion = "3.5.0" javadocLinks = [ "https://docs.oracle.com/en/java/javase/17/docs/api/", "https://docs.spring.io/spring-framework/docs/current/javadoc-api/" diff --git a/settings.gradle b/settings.gradle index 2e87f0f..d9b006e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { id 'io.spring.nohttp' version '0.0.11' id 'io.spring.javaformat' version '0.0.43' id 'org.asciidoctor.jvm.convert' version '3.3.2' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' } repositories { gradlePluginPortal() diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java index 80b365c..4fc75c2 100644 --- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java +++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java @@ -24,14 +24,13 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition; +import org.springframework.boot.autoconfigure.security.oauth2.client.ConditionalOnOAuth2ClientRegistrationProperties; +import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties; import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesMapper; import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; import org.springframework.security.oauth2.client.AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager; import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.InMemoryReactiveOAuth2AuthorizedClientService; @@ -55,7 +54,7 @@ import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepo @EnableConfigurationProperties(OAuth2ClientProperties.class) @ConditionalOnClass(name = "org.springframework.security.oauth2.client.registration.ClientRegistration") @ConditionalOnProperty("spring.credhub.oauth2.registration-id") -@Conditional(ClientsConfiguredCondition.class) +@ConditionalOnOAuth2ClientRegistrationProperties public class CredHubOAuth2AutoConfiguration { private final OAuth2ClientProperties properties; diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java index e898c9d..345b9cb 100644 --- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java +++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java @@ -19,8 +19,8 @@ package org.springframework.credhub.autoconfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientAutoConfiguration; import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.credhub.core.CredHubProperties; import org.springframework.credhub.core.CredHubTemplate;