From 31d059153bae9a08a6443df0c225d63defac5222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 10:37:50 +0200 Subject: [PATCH 01/10] upgrade spring 3 to 3.3.13 version --- .../libraries/spring-boot/buildGradle-sb3-Kts.mustache | 2 +- .../kotlin-spring/libraries/spring-boot/pom-sb3.mustache | 2 +- .../libraries/spring-cloud/buildGradle-sb3-Kts.mustache | 2 +- .../kotlin-spring/libraries/spring-cloud/pom-sb3.mustache | 2 +- .../buildGradle-sb3-Kts.mustache | 2 +- .../spring-declarative-http-interface/pom-sb3.mustache | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../kotlin-spring-declarative-interface-wrapped/pom.xml | 2 +- .../kotlin-spring-declarative-interface/build.gradle.kts | 2 +- .../server/petstore/kotlin-spring-declarative-interface/pom.xml | 2 +- .../petstore/kotlin-spring-sealed-interfaces/build.gradle.kts | 2 +- samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml | 2 +- .../kotlin-springboot-3-no-response-entity/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-3-no-response-entity/pom.xml | 2 +- samples/server/petstore/kotlin-springboot-3/build.gradle.kts | 2 +- samples/server/petstore/kotlin-springboot-3/pom.xml | 2 +- .../kotlin-springboot-additionalproperties/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-additionalproperties/pom.xml | 2 +- .../kotlin-springboot-delegate-nodefaults/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-delegate-nodefaults/pom.xml | 2 +- .../petstore/kotlin-springboot-integer-enum/build.gradle.kts | 2 +- samples/server/petstore/kotlin-springboot-integer-enum/pom.xml | 2 +- .../petstore/kotlin-springboot-request-cookie/build.gradle.kts | 2 +- .../server/petstore/kotlin-springboot-request-cookie/pom.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache index c1fb61e35c18..012c5b8fbac3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache @@ -24,7 +24,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache index ea1ac4523871..bc729d19610c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache @@ -21,7 +21,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index 7f3116417091..86638ad84e4b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache index 80e639d71a8c..306d92640330 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index 714f6e6a0b90..779393f94e31 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache index 17677535be5b..7f2159f7053a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index b99582491505..5cea7750d45d 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml index ef82a5722863..796b34c30d5c 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml @@ -19,7 +19,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index b99582491505..5cea7750d45d 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml index ef82a5722863..796b34c30d5c 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml @@ -19,7 +19,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index 5eaa823f4fd4..143a18545814 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml index f9cb971649a0..f3d327857823 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index 5eaa823f4fd4..143a18545814 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml index f9cb971649a0..f3d327857823 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts index 559b1f327bec..2657a318e39b 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts @@ -22,7 +22,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml b/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml index 67af2523dcb8..8e222362b0e8 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts index db73c5e21693..e568084a5513 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts index db73c5e21693..e568084a5513 100644 --- a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-3/pom.xml b/samples/server/petstore/kotlin-springboot-3/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-3/pom.xml +++ b/samples/server/petstore/kotlin-springboot-3/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts index db73c5e21693..e568084a5513 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml b/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts index 6122df330e69..7fa02f72fc4a 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts @@ -18,7 +18,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml index c7a557207ccc..d077ad869328 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts index 559b1f327bec..2657a318e39b 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts @@ -22,7 +22,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml b/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml index 67af2523dcb8..8e222362b0e8 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml +++ b/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts index fa644c9b144c..1f5460191b95 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts @@ -22,7 +22,7 @@ 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("org.springframework.boot") version "3.3.13" id("io.spring.dependency-management") version "1.0.14.RELEASE" } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml b/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml index 797865c697a9..de45a8450db0 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml +++ b/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 From a5160fb5f25f91a7b2cd7dbdb1731441a3bbb019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 10:58:11 +0200 Subject: [PATCH 02/10] upgrade spring cloud to 2023.0.9 --- .../JavaSpring/libraries/spring-cloud/pom-sb3.mustache | 2 +- .../libraries/spring-cloud/buildGradle-sb3-Kts.mustache | 2 +- .../kotlin-spring/libraries/spring-cloud/pom-sb3.mustache | 2 +- .../buildGradle-sb3-Kts.mustache | 2 +- .../spring-declarative-http-interface/pom-sb3.mustache | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache index 66056bed0d6b..611253df4607 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache @@ -58,7 +58,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index 86638ad84e4b..a55d41c240bc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -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.9") } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache index 306d92640330..fcc5f451c6b2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache @@ -34,7 +34,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index 779393f94e31..cb72a20cbe38 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -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.9") } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache index 7f2159f7053a..3dc334dd5272 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache @@ -34,7 +34,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import From 6328c436ebc94bd90a452f6e5e2b5efe67ce1d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 11:01:04 +0200 Subject: [PATCH 03/10] update samples --- samples/client/petstore/spring-cloud-auth/pom.xml | 2 +- samples/client/petstore/spring-cloud-date-time/pom.xml | 2 +- samples/client/petstore/spring-cloud-deprecated/pom.xml | 2 +- samples/client/petstore/spring-cloud-feign-without-url/pom.xml | 2 +- samples/client/petstore/spring-cloud-tags/pom.xml | 2 +- samples/client/petstore/spring-cloud/pom.xml | 2 +- .../client/petstore/spring-cloud-3-with-optional/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-3/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-async/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml | 2 +- .../openapi3/client/petstore/spring-cloud-http-basic/pom.xml | 2 +- .../openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml | 2 +- .../client/petstore/spring-cloud-spring-pageable/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud/pom.xml | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../kotlin-spring-declarative-interface-wrapped/pom.xml | 2 +- .../kotlin-spring-declarative-interface/build.gradle.kts | 2 +- .../server/petstore/kotlin-spring-declarative-interface/pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/samples/client/petstore/spring-cloud-auth/pom.xml b/samples/client/petstore/spring-cloud-auth/pom.xml index 498f314d0a63..5e6a826c578d 100644 --- a/samples/client/petstore/spring-cloud-auth/pom.xml +++ b/samples/client/petstore/spring-cloud-auth/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/client/petstore/spring-cloud-date-time/pom.xml b/samples/client/petstore/spring-cloud-date-time/pom.xml index 50553ca5c373..d7c2174d1682 100644 --- a/samples/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/client/petstore/spring-cloud-deprecated/pom.xml b/samples/client/petstore/spring-cloud-deprecated/pom.xml index 78f24663772d..3be39d2d56ba 100644 --- a/samples/client/petstore/spring-cloud-deprecated/pom.xml +++ b/samples/client/petstore/spring-cloud-deprecated/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml index dd8748ea994c..5fc75c50cd08 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml +++ b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/client/petstore/spring-cloud-tags/pom.xml b/samples/client/petstore/spring-cloud-tags/pom.xml index 97da2d0d7427..6f15840d3a7b 100644 --- a/samples/client/petstore/spring-cloud-tags/pom.xml +++ b/samples/client/petstore/spring-cloud-tags/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index dd8748ea994c..5fc75c50cd08 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml index d1e0d3e4405d..9fa42c49f11a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml index d461f1ea1c80..42313ac2c020 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml index 296a33eeabb4..7cce9d2216d9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml index 854f21b34444..4ca20e0ac39e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml index 949bfd133a27..21424aa46e9f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml index 48297b27b007..7e113bc5a069 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml index c87e404bb14e..280031ece3fa 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud/pom.xml b/samples/openapi3/client/petstore/spring-cloud/pom.xml index 48297b27b007..7e113bc5a069 100644 --- a/samples/openapi3/client/petstore/spring-cloud/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.9 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index 5cea7750d45d..e77ccfe45ce5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -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.9") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml index 796b34c30d5c..c4bd2232eb7a 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index 5cea7750d45d..e77ccfe45ce5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -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.9") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml index 796b34c30d5c..c4bd2232eb7a 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index 143a18545814..938690b4eb90 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -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.9") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml index f3d327857823..31350a76bde0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index 143a18545814..938690b4eb90 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -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.9") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml index f3d327857823..31350a76bde0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.9 pom import From 38eb66c398d18ec285921725983eebe4e30ab667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 12:01:21 +0200 Subject: [PATCH 04/10] update samples --- .../JavaSpring/libraries/spring-cloud/pom-sb3.mustache | 2 +- .../libraries/spring-cloud/buildGradle-sb3-Kts.mustache | 2 +- .../kotlin-spring/libraries/spring-cloud/pom-sb3.mustache | 2 +- .../buildGradle-sb3-Kts.mustache | 2 +- .../spring-declarative-http-interface/pom-sb3.mustache | 2 +- samples/client/petstore/spring-cloud-auth/pom.xml | 2 +- samples/client/petstore/spring-cloud-date-time/pom.xml | 2 +- samples/client/petstore/spring-cloud-deprecated/pom.xml | 2 +- samples/client/petstore/spring-cloud-feign-without-url/pom.xml | 2 +- samples/client/petstore/spring-cloud-tags/pom.xml | 2 +- samples/client/petstore/spring-cloud/pom.xml | 2 +- .../client/petstore/spring-cloud-3-with-optional/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-3/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-async/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml | 2 +- .../openapi3/client/petstore/spring-cloud-http-basic/pom.xml | 2 +- .../openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml | 2 +- .../client/petstore/spring-cloud-spring-pageable/pom.xml | 2 +- samples/openapi3/client/petstore/spring-cloud/pom.xml | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../pom.xml | 2 +- .../build.gradle.kts | 2 +- .../kotlin-spring-declarative-interface-wrapped/pom.xml | 2 +- .../kotlin-spring-declarative-interface/build.gradle.kts | 2 +- .../server/petstore/kotlin-spring-declarative-interface/pom.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache index 611253df4607..846798687959 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache @@ -58,7 +58,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index a55d41c240bc..ca6cdc76d5c4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache index fcc5f451c6b2..31d935004321 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache @@ -34,7 +34,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index cb72a20cbe38..8e3687c4bd44 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache index 3dc334dd5272..7c9d77b63ef2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache @@ -34,7 +34,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-auth/pom.xml b/samples/client/petstore/spring-cloud-auth/pom.xml index 5e6a826c578d..29cc443d753a 100644 --- a/samples/client/petstore/spring-cloud-auth/pom.xml +++ b/samples/client/petstore/spring-cloud-auth/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-date-time/pom.xml b/samples/client/petstore/spring-cloud-date-time/pom.xml index d7c2174d1682..e7316a08bf57 100644 --- a/samples/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-deprecated/pom.xml b/samples/client/petstore/spring-cloud-deprecated/pom.xml index 3be39d2d56ba..7673b10b716a 100644 --- a/samples/client/petstore/spring-cloud-deprecated/pom.xml +++ b/samples/client/petstore/spring-cloud-deprecated/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml index 5fc75c50cd08..56f778732749 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml +++ b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-tags/pom.xml b/samples/client/petstore/spring-cloud-tags/pom.xml index 6f15840d3a7b..57deabfa8bf9 100644 --- a/samples/client/petstore/spring-cloud-tags/pom.xml +++ b/samples/client/petstore/spring-cloud-tags/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index 5fc75c50cd08..56f778732749 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml index 9fa42c49f11a..0323d7d2dc9d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml index 42313ac2c020..02400f0c97c3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml index 7cce9d2216d9..095b5f666ab4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml index 4ca20e0ac39e..4241ab48b361 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml index 21424aa46e9f..f43a20e94da8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml index 7e113bc5a069..7acd0b88c845 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml index 280031ece3fa..262b67ff6480 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud/pom.xml b/samples/openapi3/client/petstore/spring-cloud/pom.xml index 7e113bc5a069..7acd0b88c845 100644 --- a/samples/openapi3/client/petstore/spring-cloud/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index e77ccfe45ce5..140e3a488f96 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml index c4bd2232eb7a..62cbcd1dd29f 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index e77ccfe45ce5..140e3a488f96 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml index c4bd2232eb7a..62cbcd1dd29f 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index 938690b4eb90..c006b54a1232 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml index 31350a76bde0..e3974c310f9b 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index 938690b4eb90..c006b54a1232 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.9") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml index 31350a76bde0..e3974c310f9b 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.9 + 2023.0.6 pom import From 810fa802193d665ff53e38ca33e802c2eafe4ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 12:32:07 +0200 Subject: [PATCH 05/10] update samples --- .../libraries/spring-cloud/buildGradle-sb3-Kts.mustache | 2 +- .../libraries/spring-cloud/buildGradleKts.mustache | 2 +- .../kotlin-spring/libraries/spring-cloud/pom-sb3.mustache | 7 ++----- .../kotlin-spring/libraries/spring-cloud/pom.mustache | 7 ++----- .../buildGradle-sb3-Kts.mustache | 2 +- .../spring-declarative-http-interface/pom-sb3.mustache | 7 ++----- .../server/petstore/kotlin-spring-cloud/build.gradle.kts | 2 +- samples/server/petstore/kotlin-spring-cloud/pom.xml | 5 ++--- .../build.gradle.kts | 2 +- .../pom.xml | 5 ++--- .../build.gradle.kts | 2 +- .../pom.xml | 5 ++--- .../build.gradle.kts | 2 +- .../kotlin-spring-declarative-interface-wrapped/pom.xml | 5 ++--- .../kotlin-spring-declarative-interface/build.gradle.kts | 2 +- .../petstore/kotlin-spring-declarative-interface/pom.xml | 5 ++--- 16 files changed, 24 insertions(+), 38 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index ca6cdc76d5c4..8946bf3e3d0a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache index d8bae3cc9c12..2a8ae92fc7d6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache @@ -65,7 +65,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("javax.validation:validation-api"){{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache index 31d935004321..3ab6582ac525 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache @@ -192,11 +192,8 @@ {{#hasAuthMethods}} - org.springframework.cloud - spring-cloud-starter-oauth2 - {{^parentOverridden}} - 2.2.5.RELEASE - {{/parentOverridden}} + org.springframework.boot + spring-boot-starter-oauth2-client {{/hasAuthMethods}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache index 0296d383952f..492a50094e58 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache @@ -170,11 +170,8 @@ {{#hasAuthMethods}} - org.springframework.cloud - spring-cloud-starter-oauth2 - {{^parentOverridden}} - 2.2.5.RELEASE - {{/parentOverridden}} + org.springframework.boot + spring-boot-starter-oauth2-client {{/hasAuthMethods}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index 8e3687c4bd44..28011fe1a955 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache index 7c9d77b63ef2..f4a6053d110f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache @@ -188,11 +188,8 @@ {{#hasAuthMethods}} - org.springframework.cloud - spring-cloud-starter-oauth2 - {{^parentOverridden}} - 2.2.5.RELEASE - {{/parentOverridden}} + org.springframework.boot + spring-boot-starter-oauth2-client {{/hasAuthMethods}} diff --git a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts index ac2381f20ab6..e2b45f91a089 100644 --- a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.springframework.cloud:spring-cloud-starter-openfeign") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("javax.validation:validation-api") implementation("javax.annotation:javax.annotation-api:1.3.2") diff --git a/samples/server/petstore/kotlin-spring-cloud/pom.xml b/samples/server/petstore/kotlin-spring-cloud/pom.xml index a6b6639f7a3a..ad0b139c286e 100644 --- a/samples/server/petstore/kotlin-spring-cloud/pom.xml +++ b/samples/server/petstore/kotlin-spring-cloud/pom.xml @@ -109,9 +109,8 @@ spring-cloud-starter-openfeign - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index 140e3a488f96..a1d1e2c62c14 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml index 62cbcd1dd29f..8d80f1de11dc 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml @@ -137,9 +137,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index 140e3a488f96..a1d1e2c62c14 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml index 62cbcd1dd29f..8d80f1de11dc 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml @@ -137,9 +137,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index c006b54a1232..28d5c82cc44d 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml index e3974c310f9b..15416bbf0ea7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml @@ -125,9 +125,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index c006b54a1232..28d5c82cc44d 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml index e3974c310f9b..15416bbf0ea7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml @@ -125,9 +125,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat From 5f2c89f85a28ce783710235c42b2d2c4a05a0edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 12:38:53 +0200 Subject: [PATCH 06/10] update samples --- .../libraries/spring-boot/buildGradle-sb3-Kts.mustache | 2 +- .../libraries/spring-cloud/buildGradle-sb3-Kts.mustache | 2 +- .../buildGradle-sb3-Kts.mustache | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../kotlin-spring-declarative-interface/build.gradle.kts | 2 +- .../petstore/kotlin-spring-sealed-interfaces/build.gradle.kts | 2 +- .../kotlin-springboot-3-no-response-entity/build.gradle.kts | 2 +- samples/server/petstore/kotlin-springboot-3/build.gradle.kts | 2 +- .../kotlin-springboot-additionalproperties/build.gradle.kts | 2 +- .../kotlin-springboot-delegate-nodefaults/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-integer-enum/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-request-cookie/build.gradle.kts | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache index 012c5b8fbac3..d889428fca20 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache @@ -25,7 +25,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index 8946bf3e3d0a..17625708d986 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index 28011fe1a955..7149f522e5bc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index a1d1e2c62c14..3683f5a46308 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index a1d1e2c62c14..3683f5a46308 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index 28d5c82cc44d..84ac69c7c6f1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index 28d5c82cc44d..84ac69c7c6f1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts index 2657a318e39b..a55213af225e 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts @@ -23,7 +23,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts index e568084a5513..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts index e568084a5513..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts index e568084a5513..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts index 7fa02f72fc4a..af76af1bc768 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts index 2657a318e39b..a55213af225e 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts @@ -23,7 +23,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts index 1f5460191b95..33899c980eec 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts @@ -23,7 +23,7 @@ plugins { id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion id("org.springframework.boot") version "3.3.13" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("io.spring.dependency-management") version "1.1.7" } dependencies { From b1e90b7b13057010bf2d19635dee151b70e5d03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 13:44:47 +0200 Subject: [PATCH 07/10] update samples --- .../spring-cloud/clientConfiguration.mustache | 95 +++++++++++++++---- .../configuration/ClientConfiguration.kt | 5 + 2 files changed, 84 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache index 3bc7c2bfcd64..cd74b3b01cca 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache @@ -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 @@ -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 @@ -60,10 +71,8 @@ import feign.RequestTemplate {{/hasOAuthMethods}} {{/useSpringBoot4}} -@Configuration -{{^useSpringBoot4}} -@EnableConfigurationProperties -{{/useSpringBoot4}} +@Configuration{{^useSpringBoot4}}{{^useSpringBoot3}} +@EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}} class ClientConfiguration { {{#authMethods}} @@ -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 { @@ -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") @@ -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( diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt index 8a2e2b4b7270..b233903787d1 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt @@ -3,18 +3,22 @@ package org.openapitools.configuration import org.springframework.beans.factory.annotation.Value import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.context.properties.ConfigurationProperties + import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration + import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext import org.springframework.security.oauth2.client.OAuth2ClientContext import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails + @Configuration @EnableConfigurationProperties class ClientConfiguration { + @Bean @ConditionalOnProperty("openapipetstore.security.petstore_auth.client-id") fun petstoreAuthRequestInterceptor(oAuth2ClientContext: OAuth2ClientContext): OAuth2FeignRequestInterceptor { @@ -36,6 +40,7 @@ class ClientConfiguration { return details } + @Value("\${openapipetstore.security.api_key.key:}") private lateinit var apiKeyKey: String From a5252dc1e293288fd73ab6c54faf4a13fda9d28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 15:13:52 +0200 Subject: [PATCH 08/10] revert changes --- .../libraries/spring-cloud/buildGradleKts.mustache | 2 +- .../kotlin-spring/libraries/spring-cloud/pom.mustache | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache index 2a8ae92fc7d6..d8bae3cc9c12 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache @@ -65,7 +65,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.springframework.cloud:spring-cloud-starter-openfeign"){{#hasAuthMethods}} - implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}} + implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}} {{#useBeanValidation}} implementation("javax.validation:validation-api"){{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache index 492a50094e58..0296d383952f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache @@ -170,8 +170,11 @@ {{#hasAuthMethods}} - org.springframework.boot - spring-boot-starter-oauth2-client + org.springframework.cloud + spring-cloud-starter-oauth2 + {{^parentOverridden}} + 2.2.5.RELEASE + {{/parentOverridden}} {{/hasAuthMethods}} From ba1147f4f5661f8480e9ea6693e3b7968ff891db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 15:16:41 +0200 Subject: [PATCH 09/10] fix samples --- samples/server/petstore/kotlin-spring-cloud/build.gradle.kts | 2 +- samples/server/petstore/kotlin-spring-cloud/pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts index e2b45f91a089..ac2381f20ab6 100644 --- a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.springframework.cloud:spring-cloud-starter-openfeign") - implementation("org.springframework.boot:spring-boot-starter-oauth2-client") + implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") implementation("javax.validation:validation-api") implementation("javax.annotation:javax.annotation-api:1.3.2") diff --git a/samples/server/petstore/kotlin-spring-cloud/pom.xml b/samples/server/petstore/kotlin-spring-cloud/pom.xml index ad0b139c286e..a6b6639f7a3a 100644 --- a/samples/server/petstore/kotlin-spring-cloud/pom.xml +++ b/samples/server/petstore/kotlin-spring-cloud/pom.xml @@ -109,8 +109,9 @@ spring-cloud-starter-openfeign - org.springframework.boot - spring-boot-starter-oauth2-client + org.springframework.cloud + spring-cloud-starter-oauth2 + 2.2.5.RELEASE com.fasterxml.jackson.dataformat From 49a3262ef336ecf2c5b8931a2b7a7be02b029148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 20 Apr 2026 16:58:05 +0200 Subject: [PATCH 10/10] add whitespace to retrigger tests --- .../codegen/kotlin/spring/KotlinSpringServerCodegenTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 504583c759dd..1cc51f226049 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -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");