Fix typo in config file for Spring 3

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java

@@ -73,7 +73,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
     public static final String BEAN_QUALIFIERS = "beanQualifiers";
 
     public static final String USE_JAKARTA_EE = "useJakartaEe";
-    public static final String SPRING_BOOT_3 = "SpringBoot3";
+    public static final String SPRING_BOOT_3 = "useSpringBoot3";
 
     private String basePackage;
     private String invokerPackage;

samples/server/petstore/kotlin-springboot-3/build.gradle.kts

@@ -1,49 +1,42 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7")
-    }
-}
-
 group = "org.openapitools"
 version = "1.0.0"
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "17"
 }
 
 plugins {
-    val kotlinVersion = "1.6.21"
+    val kotlinVersion = "1.7.10"
     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.6.7"
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("org.springframework.boot") version "3.0.2"
+    id("io.spring.dependency-management") version "1.0.14.RELEASE"
 }
 
 dependencies {
-    compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    compile("org.jetbrains.kotlin:kotlin-reflect")
-    compile("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+        implementation("org.springframework.boot:spring-boot-starter-web")
 
-    compile("com.google.code.findbugs:jsr305:3.0.2")
-    compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
-    compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
-    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:2.1.0")
+    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation("jakarta.validation:jakarta.validation-api")
+    implementation("jakarta.annotation:jakarta.annotation-api:2.1.0")
 
-    testCompile("org.jetbrains.kotlin:kotlin-test-junit5")
-    testCompile("org.springframework.boot:spring-boot-starter-test") {
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+    testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude(module = "junit")
     }
 }

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

@@ -8,16 +8,29 @@
     <properties>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
+        <kotlin-test-junit5.version>1.7.10</kotlin-test-junit5.version>
 
-        <kotlin.version>1.6.21</kotlin.version>
+        <kotlin.version>1.7.10</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.6.7</version>
+        <version>3.0.2</version>
     </parent>
+    <repositories>
+        <repository>
+            <id>repository.spring.milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
@@ -41,7 +54,7 @@
                     <compilerPlugins>
                         <plugin>spring</plugin>
                     </compilerPlugins>
-                    <jvmTarget>1.8</jvmTarget>
+                    <jvmTarget>17</jvmTarget>
                 </configuration>
                 <executions>
                     <execution>

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/ApiUtil.kt

@@ -2,7 +2,7 @@ package org.openapitools.api
 
 import org.springframework.web.context.request.NativeWebRequest
 
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpServletResponse
 import java.io.IOException
 
 object ApiUtil {

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt

@@ -3,8 +3,8 @@ package org.openapitools.api
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
-import javax.servlet.http.HttpServletResponse
-import javax.validation.ConstraintViolationException
+import jakarta.servlet.http.HttpServletResponse
+import jakarta.validation.ConstraintViolationException
 
 // TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception
 sealed class ApiException(msg: String, val code: Int) : Exception(msg)

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt

@@ -11,8 +11,8 @@ import org.springframework.validation.annotation.Validated
 import org.springframework.web.context.request.NativeWebRequest
 import org.springframework.beans.factory.annotation.Autowired
 
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 import kotlin.collections.List
 import kotlin.collections.Map

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt

@@ -10,8 +10,8 @@ import org.springframework.validation.annotation.Validated
 import org.springframework.web.context.request.NativeWebRequest
 import org.springframework.beans.factory.annotation.Autowired
 
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 import kotlin.collections.List
 import kotlin.collections.Map

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt

@@ -10,8 +10,8 @@ import org.springframework.validation.annotation.Validated
 import org.springframework.web.context.request.NativeWebRequest
 import org.springframework.beans.factory.annotation.Autowired
 
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 import kotlin.collections.List
 import kotlin.collections.Map

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt

@@ -2,8 +2,8 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * A category for a pet

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt

@@ -2,8 +2,8 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * Describes the result of uploading an image resource

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt

@@ -3,8 +3,8 @@ package org.openapitools.model
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * An order for a pets from the pet store

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt

@@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
 import org.openapitools.model.Category
 import org.openapitools.model.Tag
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * A pet for sale in the pet store

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt

@@ -2,8 +2,8 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * A tag for a pet

samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt

@@ -2,8 +2,8 @@ package org.openapitools.model
 
 import java.util.Objects
 import com.fasterxml.jackson.annotation.JsonProperty
-import javax.validation.constraints.*
-import javax.validation.Valid
+import jakarta.validation.Valid
+import jakarta.validation.constraints.*
 
 /**
  * A User who is purchasing from the pet store