From 21d8d3a26e71d1d057e019be114d4825dacef9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Sj=C3=B6blom?= Date: Sun, 1 May 2022 07:20:18 +0000 Subject: [PATCH] Kotlin spring version bump (#12281) * [Kotlin-Spring] Bumping dependency versions * Downgrading Springfox, updating annotation * Updating samples * Updating unrelated samples --- .../languages/KotlinClientCodegen.java | 4 +- .../generatedAnnotation.mustache | 2 +- .../spring-boot/buildGradleKts.mustache | 28 +++++------ .../libraries/spring-boot/pom.mustache | 48 ++++--------------- .../include/CppRestPetstoreClient/ModelBase.h | 4 ++ .../cpp-restsdk/client/src/ModelBase.cpp | 47 ++++++++++++++++++ .../build.gradle.kts | 18 +++---- .../kotlin-springboot-delegate/pom.xml | 40 ++-------------- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/PetApiDelegate.kt | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiDelegate.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/UserApiDelegate.kt | 2 +- .../build.gradle.kts | 18 +++---- .../kotlin-springboot-modelMutable/pom.xml | 40 ++-------------- .../build.gradle.kts | 20 +++----- .../kotlin-springboot-reactive/pom.xml | 42 +++------------- .../build.gradle.kts | 20 +++----- .../kotlin-springboot-source-swagger1/pom.xml | 42 +++------------- .../build.gradle.kts | 20 +++----- .../kotlin-springboot-source-swagger2/pom.xml | 42 +++------------- .../build.gradle.kts | 18 +++---- .../kotlin-springboot-springfox/pom.xml | 40 ++-------------- .../openapitools/SpringFoxConfiguration.kt | 2 +- .../kotlin-springboot/build.gradle.kts | 16 ++----- .../server/petstore/kotlin-springboot/pom.xml | 38 ++------------- 27 files changed, 162 insertions(+), 399 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 67bd6701f30..03f68997cb3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -479,7 +479,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { private void processDateLibrary() { if (DateLibrary.THREETENBP.value.equals(dateLibrary) || DateLibrary.THREETENBP_LOCALDATETIME.value.equals(dateLibrary)) { - processThreeTeBpDate(dateLibrary); + processThreeTenBpDate(dateLibrary); } else if (DateLibrary.STRING.value.equals(dateLibrary)) { processStringDate(); } else if (DateLibrary.JAVA8.value.equals(dateLibrary) || DateLibrary.JAVA8_LOCALDATETIME.value.equals(dateLibrary)) { @@ -495,7 +495,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { } } - private void processThreeTeBpDate(String dateLibrary) { + private void processThreeTenBpDate(String dateLibrary) { additionalProperties.put(DateLibrary.THREETENBP.value, true); typeMapping.put("date", "LocalDate"); importMapping.put("LocalDate", "org.threeten.bp.LocalDate"); diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache index cda4e662bdc..5b5de7676c2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache @@ -1 +1 @@ -@javax.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file +@jakarta.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache index 6d3eac02783..77abd068b75 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,29 +21,29 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { -{{#reactive}} val kotlinxCoroutinesVersion = "1.2.0" +{{#reactive}} val kotlinxCoroutinesVersion = "1.6.1" {{/reactive}} compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect"){{^reactive}} compile("org.springframework.boot:spring-boot-starter-web"){{/reactive}}{{#reactive}} compile("org.springframework.boot:spring-boot-starter-webflux") compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion"){{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}} - compile("org.springdoc:springdoc-openapi-{{#reactive}}webflux-{{/reactive}}ui:1.6.6"){{/useSwaggerUI}}{{^useSwaggerUI}} - compile("org.springdoc:springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core:1.6.6"){{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} + compile("org.springdoc:springdoc-openapi-{{#reactive}}webflux-{{/reactive}}ui:1.6.8"){{/useSwaggerUI}}{{^useSwaggerUI}} + compile("org.springdoc:springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core:1.6.8"){{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} compile("io.springfox:springfox-swagger2:2.9.2"){{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}} - compile("org.webjars:swagger-ui:4.8.1") + compile("org.webjars:swagger-ui:4.10.3") compile("org.webjars:webjars-locator-core"){{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}} - compile("io.swagger:swagger-annotations:1.6.5"){{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} - compile("io.swagger.core.v3:swagger-annotations:2.1.13"){{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} + compile("io.swagger:swagger-annotations:1.6.6"){{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} + compile("io.swagger.core.v3:swagger-annotations:2.2.0"){{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -52,7 +52,7 @@ dependencies { compile("com.fasterxml.jackson.module:jackson-module-kotlin") {{#useBeanValidation}} compile("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}} - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { @@ -62,9 +62,3 @@ dependencies { testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion") {{/reactive}} } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache index 2ac4871e094..2a16261195a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache @@ -6,23 +6,23 @@ {{artifactId}} {{artifactVersion}} {{#reactive}} - 1.2.0{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}} - 1.6.6{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} + 1.6.1{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}} + 1.6.8{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}} 2.9.2{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}} - 4.8.1{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}} - 1.6.5{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} - 2.1.13{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} + 4.10.3{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}} + 1.6.6{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} + 2.2.0{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -184,34 +184,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h index 8d005639e81..72191c60a9c 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h @@ -75,6 +75,7 @@ public: static web::json::value toJson( const std::shared_ptr& val ); template static web::json::value toJson( const std::shared_ptr& val ); + static web::json::value toJson( const std::shared_ptr& val ); template static web::json::value toJson( const std::vector& val ); template @@ -91,6 +92,7 @@ public: static bool fromString( const utility::string_t& val, std::shared_ptr & ); template static bool fromString( const utility::string_t& val, std::shared_ptr& ); + static bool fromString( const utility::string_t& val, std::shared_ptr& outVal ); template static bool fromString( const utility::string_t& val, std::vector & ); template @@ -107,6 +109,7 @@ public: static bool fromJson( const web::json::value& val, std::shared_ptr & ); template static bool fromJson( const web::json::value& val, std::shared_ptr& ); + static bool fromJson( const web::json::value& val, std::shared_ptr &outVal ); template static bool fromJson( const web::json::value& val, std::vector & ); template @@ -124,6 +127,7 @@ public: static std::shared_ptr toHttpContent( const utility::string_t& name, const std::shared_ptr& ); template static std::shared_ptr toHttpContent( const utility::string_t& name, const std::shared_ptr& , const utility::string_t& contentType = utility::conversions::to_string_t("application/json") ); + static std::shared_ptr toHttpContent(const utility::string_t& name, const std::shared_ptr& value , const utility::string_t& contentType = utility::conversions::to_string_t("application/json") ); template static std::shared_ptr toHttpContent( const utility::string_t& name, const std::vector& value, const utility::string_t& contentType = utility::conversions::to_string_t("") ); template diff --git a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp index bfbdb963f33..ba5f63e53fe 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp @@ -123,6 +123,15 @@ web::json::value ModelBase::toJson( const std::shared_ptr& content } return value; } +web::json::value ModelBase::toJson( const std::shared_ptr& val ) +{ + web::json::value retVal; + if(val != nullptr) + { + retVal = toJson(*val); + } + return retVal; +} bool ModelBase::fromString( const utility::string_t& val, bool &outVal ) { utility::stringstream_t ss(val); @@ -253,6 +262,19 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr& outVal ) +{ + bool ok = false; + if(outVal == nullptr) + { + outVal = std::shared_ptr(new utility::datetime()); + } + if( outVal != nullptr ) + { + ok = fromJson(web::json::value::parse(val), *outVal); + } + return ok; +} bool ModelBase::fromJson( const web::json::value& val, bool & outVal ) { outVal = !val.is_boolean() ? false : val.as_bool(); @@ -330,6 +352,19 @@ bool ModelBase::fromJson( const web::json::value& val, std::shared_ptr &outVal ) +{ + bool ok = false; + if(outVal == nullptr) + { + outVal = std::shared_ptr(new utility::datetime()); + } + if( outVal != nullptr ) + { + ok = fromJson(val, *outVal); + } + return ok; +} std::shared_ptr ModelBase::toHttpContent( const utility::string_t& name, bool value, const utility::string_t& contentType ) { std::shared_ptr content( new HttpContent ); @@ -425,6 +460,18 @@ std::shared_ptr ModelBase::toHttpContent( const utility::string_t& } return content; } +std::shared_ptr ModelBase::toHttpContent(const utility::string_t& name, const std::shared_ptr& value , const utility::string_t& contentType ) +{ + std::shared_ptr content( new HttpContent ); + if (value != nullptr ) + { + content->setName( name ); + content->setContentDisposition( utility::conversions::to_string_t("form-data") ); + content->setContentType( contentType ); + content->setData( std::shared_ptr( new std::stringstream( utility::conversions::to_utf8string( toJson(*value).serialize() ) ) ) ); + } + return content; +} bool ModelBase::fromHttpContent(std::shared_ptr val, bool & outVal ) { utility::string_t str; diff --git a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts index f7432a5df77..45a8ef30f3e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,19 +21,19 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-web") - compile("org.springdoc:springdoc-openapi-ui:1.6.6") + compile("org.springdoc:springdoc-openapi-ui:1.6.8") compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -41,16 +41,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-delegate/pom.xml index 63eff7b8561..ad9df5d1db6 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/pom.xml +++ b/samples/server/petstore/kotlin-springboot-delegate/pom.xml @@ -6,18 +6,18 @@ openapi-spring 1.0.0 - 1.6.6 + 1.6.8 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -133,34 +133,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt index ac2e8fb6076..ac1502b5490 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -4,7 +4,7 @@ import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.RequestMapping import java.util.Optional -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class PetApiController( diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt index 277ce7d52b8..520ec736778 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt @@ -14,7 +14,7 @@ import java.util.Optional * A delegate to be called by the {@link PetApiController}}. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. */ -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) interface PetApiDelegate { fun getRequest(): Optional = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 3f52082c4c0..147df5398b4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -4,7 +4,7 @@ import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.RequestMapping import java.util.Optional -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class StoreApiController( diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt index 95f8cde396e..d743cc5b699 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -13,7 +13,7 @@ import java.util.Optional * A delegate to be called by the {@link StoreApiController}}. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. */ -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) interface StoreApiDelegate { fun getRequest(): Optional = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt index a9b1b3300c0..06ceabdf2cb 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -4,7 +4,7 @@ import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.RequestMapping import java.util.Optional -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @Controller @RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") class UserApiController( diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt index 274d497f1e9..944f65d392b 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -13,7 +13,7 @@ import java.util.Optional * A delegate to be called by the {@link UserApiController}}. * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. */ -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) interface UserApiDelegate { fun getRequest(): Optional = Optional.empty() diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts b/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts index f7432a5df77..45a8ef30f3e 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,19 +21,19 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-web") - compile("org.springdoc:springdoc-openapi-ui:1.6.6") + compile("org.springdoc:springdoc-openapi-ui:1.6.8") compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -41,16 +41,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml index 63eff7b8561..ad9df5d1db6 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml +++ b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml @@ -6,18 +6,18 @@ openapi-spring 1.0.0 - 1.6.6 + 1.6.8 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -133,34 +133,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts index 0d2b00423b1..872f35a6e5f 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,22 +21,22 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { - val kotlinxCoroutinesVersion = "1.2.0" + val kotlinxCoroutinesVersion = "1.6.1" compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-webflux") compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion") - compile("org.springdoc:springdoc-openapi-webflux-ui:1.6.6") + compile("org.springdoc:springdoc-openapi-webflux-ui:1.6.8") compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -44,7 +44,7 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { @@ -52,9 +52,3 @@ dependencies { } testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion") } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml index 478b9ecd745..833d2fe6153 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml +++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml @@ -6,19 +6,19 @@ openapi-spring 1.0.0 - 1.2.0 - 1.6.6 + 1.6.1 + 1.6.8 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -144,34 +144,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts b/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts index 13c21c0fcf2..4a6ad8eb5cf 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,21 +21,21 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-web") - compile("org.webjars:swagger-ui:4.8.1") + compile("org.webjars:swagger-ui:4.10.3") compile("org.webjars:webjars-locator-core") - compile("io.swagger:swagger-annotations:1.6.5") + compile("io.swagger:swagger-annotations:1.6.6") compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -43,16 +43,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml b/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml index 0a6f5452a69..8a4035ae65e 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml @@ -6,19 +6,19 @@ openapi-spring 1.0.0 - 4.8.1 - 1.6.5 + 4.10.3 + 1.6.6 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -143,34 +143,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts b/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts index 0fcbdc0d67e..06370a4ca4a 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,21 +21,21 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-web") - compile("org.webjars:swagger-ui:4.8.1") + compile("org.webjars:swagger-ui:4.10.3") compile("org.webjars:webjars-locator-core") - compile("io.swagger.core.v3:swagger-annotations:2.1.13") + compile("io.swagger.core.v3:swagger-annotations:2.2.0") compile("com.google.code.findbugs:jsr305:3.0.2") compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") @@ -43,16 +43,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml b/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml index c947ec6e043..486d3375f3c 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml @@ -6,19 +6,19 @@ openapi-spring 1.0.0 - 4.8.1 - 2.1.13 + 4.10.3 + 2.2.0 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -143,34 +143,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts b/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts index 7fb016df3e9..da7303a83fd 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,12 +21,12 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { @@ -34,7 +34,7 @@ dependencies { compile("org.jetbrains.kotlin:kotlin-reflect") compile("org.springframework.boot:spring-boot-starter-web") compile("io.springfox:springfox-swagger2:2.9.2") - compile("org.webjars:swagger-ui:4.8.1") + compile("org.webjars:swagger-ui:4.10.3") compile("org.webjars:webjars-locator-core") compile("com.google.code.findbugs:jsr305:3.0.2") @@ -43,16 +43,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot-springfox/pom.xml b/samples/server/petstore/kotlin-springboot-springfox/pom.xml index 68ab20f49d6..6f985627abf 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/pom.xml +++ b/samples/server/petstore/kotlin-springboot-springfox/pom.xml @@ -7,18 +7,18 @@ 1.0.0 2.9.2 - 4.8.1 + 4.10.3 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -144,34 +144,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt index eace83681c9..2fe9dde4793 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt @@ -15,7 +15,7 @@ import springfox.documentation.spring.web.plugins.Docket import springfox.documentation.swagger2.annotations.EnableSwagger2 import javax.servlet.ServletContext -@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) +@jakarta.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"]) @Configuration @EnableSwagger2 class SpringFoxConfiguration { diff --git a/samples/server/petstore/kotlin-springboot/build.gradle.kts b/samples/server/petstore/kotlin-springboot/build.gradle.kts index 527863fa2de..2eba4d51c61 100644 --- a/samples/server/petstore/kotlin-springboot/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") } } @@ -21,12 +21,12 @@ tasks.withType { } plugins { - val kotlinVersion = "1.3.30" + val kotlinVersion = "1.6.21" 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 "2.2.0.M3" - id("io.spring.dependency-management") version "1.0.5.RELEASE" + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" } dependencies { @@ -40,16 +40,10 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:1.3.5") + compile("jakarta.annotation:jakarta.annotation-api:2.1.0") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } - -repositories { - maven { url = uri("https://repo1.maven.org/maven2") } - maven { url = uri("https://repo.spring.io/snapshot") } - maven { url = uri("https://repo.spring.io/milestone") } -} diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml index ba30e7b432b..79c361092be 100644 --- a/samples/server/petstore/kotlin-springboot/pom.xml +++ b/samples/server/petstore/kotlin-springboot/pom.xml @@ -7,16 +7,16 @@ 1.0.0 3.0.2 - 1.3.5 - 1.3.31 + 2.1.0 + 1.6.21 - 1.3.30 + 1.6.21 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.2.0.M3 + 2.6.7 ${project.basedir}/src/main/kotlin @@ -127,34 +127,4 @@ test - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - -