Kotlin spring version bump (#12281)

* [Kotlin-Spring] Bumping dependency versions

* Downgrading Springfox, updating annotation

* Updating samples

* Updating unrelated samples

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");

modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache

@@ -1 +1 @@
-@javax.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
+@jakarta.annotation.Generated(value = ["{{generatorClass}}"]{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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}}ui:1.6.8"){{/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}}{{^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:swagger-annotations:1.6.6"){{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
-    compile("io.swagger.core.v3:swagger-annotations:2.1.13"){{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
+    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") }
-}

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache

@@ -6,23 +6,23 @@
     <name>{{artifactId}}</name>
     <version>{{artifactVersion}}</version>
     <properties>{{#reactive}}
-        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
+        <kotlinx-coroutines.version>1.6.1</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
-        <springdoc-openapi.version>1.6.6</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
+        <springdoc-openapi.version>1.6.8</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
         <springfox-swagger2.version>2.9.2</springfox-swagger2.version>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
-        <swagger-ui.version>4.8.1</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
+        <swagger-ui.version>4.10.3</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
-        <swagger-annotations.version>1.6.5</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
+        <swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>2.1.13</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
+        <swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -184,34 +184,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h

@@ -75,6 +75,7 @@ public:
     static web::json::value toJson( const std::shared_ptr<HttpContent>& val );
     template<typename T>
     static web::json::value toJson( const std::shared_ptr<T>& val );
+    static web::json::value toJson( const std::shared_ptr<utility::datetime>& val );
     template<typename T>
     static web::json::value toJson( const std::vector<T>& val );
     template<typename T>
@@ -91,6 +92,7 @@ public:
     static bool fromString( const utility::string_t& val, std::shared_ptr<HttpContent> & );
     template<typename T>
     static bool fromString( const utility::string_t& val, std::shared_ptr<T>& );
+    static bool fromString( const utility::string_t& val, std::shared_ptr<utility::datetime>& outVal );
     template<typename T>
     static bool fromString( const utility::string_t& val, std::vector<T> & );
     template<typename T>
@@ -107,6 +109,7 @@ public:
     static bool fromJson( const web::json::value& val, std::shared_ptr<HttpContent> & );
     template<typename T>
     static bool fromJson( const web::json::value& val, std::shared_ptr<T>& );
+    static bool fromJson( const web::json::value& val, std::shared_ptr<utility::datetime> &outVal );
     template<typename T>
     static bool fromJson( const web::json::value& val, std::vector<T> & );
     template<typename T>
@@ -124,6 +127,7 @@ public:
     static std::shared_ptr<HttpContent> toHttpContent( const utility::string_t& name, const std::shared_ptr<HttpContent>& );
     template <typename T>
     static std::shared_ptr<HttpContent> toHttpContent( const utility::string_t& name, const std::shared_ptr<T>& , const utility::string_t& contentType = utility::conversions::to_string_t("application/json") );
+    static std::shared_ptr<HttpContent> toHttpContent(const utility::string_t& name, const std::shared_ptr<utility::datetime>& value , const utility::string_t& contentType = utility::conversions::to_string_t("application/json") );
     template <typename T>
     static std::shared_ptr<HttpContent> toHttpContent( const utility::string_t& name, const std::vector<T>& value, const utility::string_t& contentType = utility::conversions::to_string_t("") );
     template <typename T>

samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp

@@ -123,6 +123,15 @@ web::json::value ModelBase::toJson( const std::shared_ptr<HttpContent>& content
     }
     return value;
 }
+web::json::value ModelBase::toJson( const std::shared_ptr<utility::datetime>& 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<HttpCo
     }
     return ok;
 }
+bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<utility::datetime>& outVal )
+{
+    bool ok = false;
+    if(outVal == nullptr)
+    {
+        outVal = std::shared_ptr<utility::datetime>(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<HttpConte
     }
     return result;
 }
+bool ModelBase::fromJson( const web::json::value& val, std::shared_ptr<utility::datetime> &outVal )
+{
+    bool ok = false;
+    if(outVal == nullptr)
+    {
+        outVal = std::shared_ptr<utility::datetime>(new utility::datetime());
+    }
+    if( outVal != nullptr )
+    {
+        ok = fromJson(val, *outVal);
+    }
+    return ok;
+}
 std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t& name, bool value, const utility::string_t& contentType )
 {
     std::shared_ptr<HttpContent> content( new HttpContent );
@@ -425,6 +460,18 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     }
     return content;
 }
+std::shared_ptr<HttpContent> ModelBase::toHttpContent(const utility::string_t& name, const std::shared_ptr<utility::datetime>& value , const utility::string_t& contentType )
+{
+    std::shared_ptr<HttpContent> 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<std::istream>( new std::stringstream( utility::conversions::to_utf8string( toJson(*value).serialize() ) ) ) );
+    }
+    return content;
+}
 bool ModelBase::fromHttpContent(std::shared_ptr<HttpContent> val, bool & outVal )
 {
     utility::string_t str;

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-delegate/pom.xml

@@ -6,18 +6,18 @@
     <name>openapi-spring</name>
     <version>1.0.0</version>
     <properties>
-        <springdoc-openapi.version>1.6.6</springdoc-openapi.version>
+        <springdoc-openapi.version>1.6.8</springdoc-openapi.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -133,34 +133,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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(

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<NativeWebRequest> = Optional.empty()

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(

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<NativeWebRequest> = Optional.empty()

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(

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<NativeWebRequest> = Optional.empty()

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-modelMutable/pom.xml

@@ -6,18 +6,18 @@
     <name>openapi-spring</name>
     <version>1.0.0</version>
     <properties>
-        <springdoc-openapi.version>1.6.6</springdoc-openapi.version>
+        <springdoc-openapi.version>1.6.8</springdoc-openapi.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -133,34 +133,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-reactive/pom.xml

@@ -6,19 +6,19 @@
     <name>openapi-spring</name>
     <version>1.0.0</version>
     <properties>
-        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.6.1</kotlinx-coroutines.version>
-        <springdoc-openapi.version>1.6.6</springdoc-openapi.version>
+        <springdoc-openapi.version>1.6.8</springdoc-openapi.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -144,34 +144,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml

@@ -6,19 +6,19 @@
     <name>openapi-spring</name>
     <version>1.0.0</version>
     <properties>
-        <swagger-ui.version>4.8.1</swagger-ui.version>
+        <swagger-ui.version>4.10.3</swagger-ui.version>
-        <swagger-annotations.version>1.6.5</swagger-annotations.version>
+        <swagger-annotations.version>1.6.6</swagger-annotations.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -143,34 +143,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml

@@ -6,19 +6,19 @@
     <name>openapi-spring</name>
     <version>1.0.0</version>
     <properties>
-        <swagger-ui.version>4.8.1</swagger-ui.version>
+        <swagger-ui.version>4.10.3</swagger-ui.version>
-        <swagger-annotations.version>2.1.13</swagger-annotations.version>
+        <swagger-annotations.version>2.2.0</swagger-annotations.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -143,34 +143,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot-springfox/pom.xml

@@ -7,18 +7,18 @@
     <version>1.0.0</version>
     <properties>
         <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
-        <swagger-ui.version>4.8.1</swagger-ui.version>
+        <swagger-ui.version>4.10.3</swagger-ui.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -144,34 +144,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>

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 {

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<KotlinCompile> {
 }
 
 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("org.springframework.boot") version "2.6.7"
-    id("io.spring.dependency-management") version "1.0.5.RELEASE"
+    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") }
-}

samples/server/petstore/kotlin-springboot/pom.xml

@@ -7,16 +7,16 @@
     <version>1.0.0</version>
     <properties>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.3.31</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
 
-        <kotlin.version>1.3.30</kotlin.version>
+        <kotlin.version>1.6.21</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.M3</version>
+        <version>2.6.7</version>
     </parent>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -127,34 +127,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>