From 4ae4bc5f5d780f8b2d7a40c217f672457d4fb215 Mon Sep 17 00:00:00 2001 From: Philzen Date: Sun, 2 Jun 2024 09:18:38 +0200 Subject: [PATCH] [kotlin-spring] Generated code using Schema with discriminator mapping will not compile (#18826) * Update springdoc-openapi-starter-* to v2.2.0 in gradle build This brings it in sync with the maven pom. Brings swagger-annotations version 2.2.15 as transitive dependency, implements the @Schema annotation property `requiredMode`. Hence fixes #14949 * Update kotlin-server samples --- .../libraries/spring-boot/buildGradle-sb3-Kts.mustache | 4 ++-- .../kotlin-springboot-request-cookie/build.gradle.kts | 2 +- .../petstore/kotlin-springboot-request/build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 4 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 c5787739fb0..bb76a5d0239 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 @@ -36,8 +36,8 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion"){{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}} - implementation("org.springdoc:springdoc-openapi-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-ui:2.0.0-M5"){{/useSwaggerUI}}{{^useSwaggerUI}} - implementation("org.springdoc:springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core:2.0.0-M5"){{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} + implementation("org.springdoc:springdoc-openapi-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-ui:2.2.0"){{/useSwaggerUI}}{{^useSwaggerUI}} + implementation("org.springdoc:springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core:2.2.0-M5"){{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} implementation("io.springfox:springfox-swagger2:2.9.2"){{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}} implementation("org.webjars:swagger-ui:4.10.3") implementation("org.webjars:webjars-locator-core"){{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}} 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 7967f0bfd6a..baf2f23d877 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.0-M5") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") diff --git a/samples/server/petstore/kotlin-springboot-request/build.gradle.kts b/samples/server/petstore/kotlin-springboot-request/build.gradle.kts index 7967f0bfd6a..baf2f23d877 100644 --- a/samples/server/petstore/kotlin-springboot-request/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-request/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.0-M5") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")