Skip to content

[KOTLIN-SPRING;JAVA-SPRING] chore: upgrade spring boot 3 to 3.3.13 version #23591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 10 commits into from
Apr 20, 2026
Merged

[KOTLIN-SPRING;JAVA-SPRING] chore: upgrade spring boot 3 to 3.3.13 version #23591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31d0591
upgrade spring 3 to 3.3.13 version
Picazsoo Apr 20, 2026
a5160fb
upgrade spring cloud to 2023.0.9
Picazsoo Apr 20, 2026
6328c43
update samples
Picazsoo Apr 20, 2026
38eb66c
update samples
Picazsoo Apr 20, 2026
810fa80
update samples
Picazsoo Apr 20, 2026
5f2c89f
update samples
Picazsoo Apr 20, 2026
b1e90b7
update samples
Picazsoo Apr 20, 2026
a5252dc
revert changes
Picazsoo Apr 20, 2026
ba1147f
fix samples
Picazsoo Apr 20, 2026
49a3262
add whitespace to retrigger tests
Picazsoo Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...rator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ plugins {
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
id("org.springframework.boot") version "3.0.2"
id("io.spring.dependency-management") version "1.0.14.RELEASE"
id("org.springframework.boot") version "3.3.13"
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
id("io.spring.dependency-management") version "1.1.7"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ...openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.3</version>
<version>3.3.13</version>
</parent>
<repositories>
<repository>
Expand Down
8 changes: 4 additions & 4 deletions ...ator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ plugins {
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
id("org.springframework.boot") version "3.0.2"
id("io.spring.dependency-management") version "1.0.14.RELEASE"
id("org.springframework.boot") version "3.3.13"
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
id("io.spring.dependency-management") version "1.1.7"
}

tasks.getByName("bootJar") {
Expand All @@ -32,7 +32,7 @@ tasks.getByName("jar") {

dependencyManagement {
imports {
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5")
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6")
}
}

Expand All @@ -58,7 +58,7 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

implementation("org.springframework.cloud:spring-cloud-starter-openfeign"){{#hasAuthMethods}}
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}}
implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}}

{{#useBeanValidation}}
implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}
Expand Down
95 changes: 79 additions & 16 deletions ...ator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@ import feign.auth.BasicAuthRequestInterceptor
import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
{{/-first}}
{{^useSpringBoot4}}
{{#isOAuth}}
import org.springframework.boot.context.properties.ConfigurationProperties
{{/isOAuth}}
{{/useSpringBoot4}}
{{^useSpringBoot4}}{{^useSpringBoot3}}{{#isOAuth}}import org.springframework.boot.context.properties.ConfigurationProperties{{/isOAuth}}{{/useSpringBoot3}}{{/useSpringBoot4}}
{{/authMethods}}
{{^useSpringBoot4}}
import org.springframework.boot.context.properties.EnableConfigurationProperties
{{/useSpringBoot4}}
{{^useSpringBoot4}}{{^useSpringBoot3}}import org.springframework.boot.context.properties.EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}}
{{#hasAuthMethods}}
import org.springframework.context.annotation.Bean
{{/hasAuthMethods}}
import org.springframework.context.annotation.Configuration
{{^useSpringBoot4}}
{{^useSpringBoot4}}{{^useSpringBoot3}}
{{#authMethods}}
{{#isOAuth}}
import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor
Expand All @@ -41,7 +35,24 @@ import org.springframework.security.oauth2.client.token.grant.password.ResourceO
{{/isPassword}}
{{/isOAuth}}
{{/authMethods}}
{{/useSpringBoot4}}
{{/useSpringBoot3}}{{/useSpringBoot4}}
{{#useSpringBoot3}}
{{#hasOAuthMethods}}
import org.springframework.security.authentication.AnonymousAuthenticationToken
import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager
import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
import org.springframework.security.oauth2.core.OAuth2AuthenticationException
import org.springframework.security.oauth2.core.OAuth2AccessToken
import org.springframework.security.core.authority.AuthorityUtils
import org.springframework.http.HttpHeaders

import feign.RequestInterceptor
import feign.RequestTemplate
{{/hasOAuthMethods}}
{{/useSpringBoot3}}
{{#useSpringBoot4}}
{{#hasOAuthMethods}}
import org.springframework.security.authentication.AnonymousAuthenticationToken
Expand All @@ -60,10 +71,8 @@ import feign.RequestTemplate
{{/hasOAuthMethods}}
{{/useSpringBoot4}}

@Configuration
{{^useSpringBoot4}}
@EnableConfigurationProperties
{{/useSpringBoot4}}
@Configuration{{^useSpringBoot4}}{{^useSpringBoot3}}
@EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}}
class ClientConfiguration {

{{#authMethods}}
Expand Down Expand Up @@ -93,7 +102,7 @@ class ClientConfiguration {

{{/isApiKey}}
{{#isOAuth}}
{{^useSpringBoot4}}
{{^useSpringBoot4}}{{^useSpringBoot3}}
@Bean
@ConditionalOnProperty("{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.client-id")
fun {{#lambda.camelcase}}{{{name}}}{{/lambda.camelcase}}RequestInterceptor(oAuth2ClientContext: OAuth2ClientContext): OAuth2FeignRequestInterceptor {
Expand Down Expand Up @@ -151,7 +160,29 @@ class ClientConfiguration {
}

{{/isImplicit}}
{{/useSpringBoot4}}
{{/useSpringBoot3}}{{/useSpringBoot4}}
{{#useSpringBoot3}}
@Bean
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
fun {{{flow}}}OAuth2RequestInterceptor({{{flow}}}AuthorizedClientManager: OAuth2AuthorizedClientManager): OAuth2RequestInterceptor {
return OAuth2RequestInterceptor(
OAuth2AuthorizeRequest.withClientRegistrationId("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}")
.principal(AnonymousAuthenticationToken(CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")))
.build(),
{{{flow}}}AuthorizedClientManager
)
}

@Bean
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
fun {{{flow}}}AuthorizedClientManager(
clientRegistrationRepository: ClientRegistrationRepository,
authorizedClientService: OAuth2AuthorizedClientService
): OAuth2AuthorizedClientManager {
return AuthorizedClientServiceOAuth2AuthorizedClientManager(clientRegistrationRepository, authorizedClientService)
}

{{/useSpringBoot3}}
{{#useSpringBoot4}}
@Bean
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
Expand All @@ -176,6 +207,38 @@ class ClientConfiguration {
{{/useSpringBoot4}}
{{/isOAuth}}
{{/authMethods}}
{{#useSpringBoot3}}
{{#hasOAuthMethods}}
class OAuth2RequestInterceptor(
private val oAuth2AuthorizeRequest: OAuth2AuthorizeRequest,
private val oAuth2AuthorizedClientManager: OAuth2AuthorizedClientManager
) : RequestInterceptor {

override fun apply(template: RequestTemplate) {
template.header(HttpHeaders.AUTHORIZATION, getBearerToken())
}

fun getAccessToken(): OAuth2AccessToken {
val authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest)
?: throw OAuth2AuthenticationException("Client failed to authenticate")
return authorizedClient.accessToken
}

fun getBearerToken(): String {
val accessToken = getAccessToken()
return String.format(java.util.Locale.ROOT, "%s %s", accessToken.tokenType?.value, accessToken.tokenValue)
}
}

companion object {
{{#authMethods}}
{{#isOAuth}}
private const val CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}} = "oauth2FeignClient"
{{/isOAuth}}
{{/authMethods}}
}
{{/hasOAuthMethods}}
{{/useSpringBoot3}}
{{#useSpringBoot4}}
{{#hasOAuthMethods}}
class OAuth2RequestInterceptor(
Expand Down
11 changes: 4 additions & 7 deletions ...penapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.3</version>
<version>3.3.13</version>
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2021.0.5</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -192,11 +192,8 @@
</dependency>
{{#hasAuthMethods}}
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-oauth2</artifactId>
{{^parentOverridden}}
<version>2.2.5.RELEASE</version>
{{/parentOverridden}}
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
{{/hasAuthMethods}}
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions ...es/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ plugins {
id("org.jetbrains.kotlin.jvm") version kotlinVersion
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
id("org.springframework.boot") version "3.0.2"
id("io.spring.dependency-management") version "1.0.14.RELEASE"
id("org.springframework.boot") version "3.3.13"
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
id("io.spring.dependency-management") version "1.1.7"
}

tasks.getByName("bootJar") {
Expand All @@ -32,7 +32,7 @@ tasks.getByName("jar") {

dependencyManagement {
imports {
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5")
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6")
}
}

Expand All @@ -58,7 +58,7 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

{{#hasAuthMethods}}
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}}
implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}}

{{#useBeanValidation}}
implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}
Expand Down
11 changes: 4 additions & 7 deletions ...main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.3</version>
<version>3.3.13</version>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2021.0.5</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -188,11 +188,8 @@
</dependency>
{{#hasAuthMethods}}
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-oauth2</artifactId>
{{^parentOverridden}}
<version>2.2.5.RELEASE</version>
{{/parentOverridden}}
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
{{/hasAuthMethods}}
<dependency>
Expand Down
1 change: 1 addition & 0 deletions ...r/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5042,6 +5042,7 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue() throws IOE
String methodPattern = "fun test\\s*\\(.*?\\)";
Pattern pattern = Pattern.compile(methodPattern);


Matcher matcher = pattern.matcher(content);
Assert.assertTrue(matcher.find(), "Method 'test' should be found in generated file");

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud-date-time/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud-deprecated/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud-feign-without-url/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud-tags/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/spring-cloud/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/spring-cloud-3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/spring-cloud-async/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>2023.0.0</version>
<version>2023.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading
Loading