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 f18e4fd8bb1..4a0cd0fdaee 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 @@ -57,9 +57,8 @@ dependencies { compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") compile("com.fasterxml.jackson.module:jackson-module-kotlin") {{#useBeanValidation}} - compile("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}} - compile("jakarta.annotation:jakarta.annotation-api:2.1.0") - + compile("javax.validation:validation-api"){{/useBeanValidation}} + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") 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 2f8bc8e8111..3a385815ffd 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 @@ -13,7 +13,7 @@ 1.6.6{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} 2.2.0{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -168,13 +168,13 @@ {{#useBeanValidation}} - jakarta.validation - jakarta.validation-api + javax.validation + validation-api {{/useBeanValidation}} - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache index b1a7e08ce4b..c362c3ac6cb 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache @@ -69,7 +69,7 @@ dependencies { implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}} {{#useBeanValidation}} - implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}} - implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") + implementation("javax.validation:validation-api"){{/useBeanValidation}} + implementation("javax.annotation:javax.annotation-api:1.3.2") } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache index fd0678f55c3..1fddfdbb51e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache @@ -13,7 +13,7 @@ 1.6.6{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}} 2.2.0{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}} 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -191,13 +191,13 @@ {{#useBeanValidation}} - jakarta.validation - jakarta.validation-api + javax.validation + validation-api {{/useBeanValidation}} - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts index b2c90c440cf..fd3524ba760 100644 --- a/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-cloud/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { implementation("org.springframework.cloud:spring-cloud-starter-openfeign") implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") - implementation("jakarta.validation:jakarta.validation-api") - implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") + implementation("javax.validation:validation-api") + implementation("javax.annotation:javax.annotation-api:1.3.2") } diff --git a/samples/server/petstore/kotlin-spring-cloud/pom.xml b/samples/server/petstore/kotlin-spring-cloud/pom.xml index 94301618ac4..654de03c5e7 100644 --- a/samples/server/petstore/kotlin-spring-cloud/pom.xml +++ b/samples/server/petstore/kotlin-spring-cloud/pom.xml @@ -7,7 +7,7 @@ 1.0.0 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -119,13 +119,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-spring-default/build.gradle.kts b/samples/server/petstore/kotlin-spring-default/build.gradle.kts index 45a8ef30f3e..59eda31df62 100644 --- a/samples/server/petstore/kotlin-spring-default/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-default/build.gradle.kts @@ -40,9 +40,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-spring-default/pom.xml b/samples/server/petstore/kotlin-spring-default/pom.xml index a44254101c2..8b51baf52f5 100644 --- a/samples/server/petstore/kotlin-spring-default/pom.xml +++ b/samples/server/petstore/kotlin-spring-default/pom.xml @@ -8,7 +8,7 @@ 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -117,13 +117,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts b/samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts index 45a8ef30f3e..59eda31df62 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts @@ -40,9 +40,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/pom.xml b/samples/server/petstore/kotlin-springboot-bigdecimal-default/pom.xml index a44254101c2..8b51baf52f5 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/pom.xml +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/pom.xml @@ -8,7 +8,7 @@ 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -117,13 +117,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts index 45a8ef30f3e..59eda31df62 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts @@ -40,9 +40,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-delegate/pom.xml index a44254101c2..8b51baf52f5 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/pom.xml +++ b/samples/server/petstore/kotlin-springboot-delegate/pom.xml @@ -8,7 +8,7 @@ 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -117,13 +117,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts b/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts index 45a8ef30f3e..59eda31df62 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-modelMutable/build.gradle.kts @@ -40,9 +40,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml index a44254101c2..8b51baf52f5 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml +++ b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml @@ -8,7 +8,7 @@ 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -117,13 +117,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/build.gradle.kts b/samples/server/petstore/kotlin-springboot-multipart-request-model/build.gradle.kts index 45a8ef30f3e..59eda31df62 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/build.gradle.kts @@ -40,9 +40,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/pom.xml b/samples/server/petstore/kotlin-springboot-multipart-request-model/pom.xml index a44254101c2..8b51baf52f5 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/pom.xml +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/pom.xml @@ -8,7 +8,7 @@ 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -117,13 +117,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts index 872f35a6e5f..34c8c1d1e11 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts @@ -43,9 +43,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml index fb9e3e28edd..f555dc75a07 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml +++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml @@ -9,7 +9,7 @@ 1.6.1 1.6.8 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -128,13 +128,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided 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 4a6ad8eb5cf..a968d763ce0 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/build.gradle.kts @@ -42,9 +42,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml b/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml index fd47cf0b9d9..0b4b2ed3ab8 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/pom.xml @@ -9,7 +9,7 @@ 4.10.3 1.6.6 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -127,13 +127,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided 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 06370a4ca4a..03467276413 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/build.gradle.kts @@ -42,9 +42,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml b/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml index 7da75fe3518..3e48c18fac3 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/pom.xml @@ -9,7 +9,7 @@ 4.10.3 2.2.0 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -127,13 +127,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts b/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts index da7303a83fd..49bb61f6306 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-springfox/build.gradle.kts @@ -42,9 +42,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot-springfox/pom.xml b/samples/server/petstore/kotlin-springboot-springfox/pom.xml index 040699b25a6..df16e753a7a 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/pom.xml +++ b/samples/server/petstore/kotlin-springboot-springfox/pom.xml @@ -9,7 +9,7 @@ 2.9.2 4.10.3 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -128,13 +128,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided diff --git a/samples/server/petstore/kotlin-springboot/build.gradle.kts b/samples/server/petstore/kotlin-springboot/build.gradle.kts index 2eba4d51c61..99f6c18bffc 100644 --- a/samples/server/petstore/kotlin-springboot/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot/build.gradle.kts @@ -39,9 +39,8 @@ dependencies { 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") - + compile("javax.validation:validation-api") + compile("javax.annotation:javax.annotation-api:1.3.2") testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml index 00063afb94a..f4d469c3a09 100644 --- a/samples/server/petstore/kotlin-springboot/pom.xml +++ b/samples/server/petstore/kotlin-springboot/pom.xml @@ -7,7 +7,7 @@ 1.0.0 3.0.2 - 2.1.0 + 1.3.2 1.6.21 1.6.21 @@ -111,13 +111,13 @@ - jakarta.validation - jakarta.validation-api + javax.validation + validation-api - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation.version} + javax.annotation + javax.annotation-api + ${javax-annotation.version} provided