Skip to content

Commit c93ec54

Browse files
pstorchpstorch
authored
[Kotlin][Spring] fix build.gradle.kts and pom.xml for SpringBoot 2.x (#19246)
1 parent 3c88071 commit c93ec54

File tree

26 files changed

+104
-115
lines changed

26 files changed

+104
-115
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ dependencies {
5757
compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
5858
compile("com.fasterxml.jackson.module:jackson-module-kotlin")
5959
{{#useBeanValidation}}
60-
compile("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}
61-
compile("jakarta.annotation:jakarta.annotation-api:2.1.0")
62-
60+
compile("javax.validation:validation-api"){{/useBeanValidation}}
61+
compile("javax.annotation:javax.annotation-api:1.3.2")
6362
testCompile("org.jetbrains.kotlin:kotlin-test-junit5")
6463
testCompile("org.springframework.boot:spring-boot-starter-test") {
6564
exclude(module = "junit")

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
1414
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
1515
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
16-
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
16+
<javax-annotation.version>1.3.2</javax-annotation.version>
1717
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
1818

1919
<kotlin.version>1.6.21</kotlin.version>
@@ -168,13 +168,13 @@
168168
{{#useBeanValidation}}
169169
<!-- Bean Validation API support -->
170170
<dependency>
171-
<groupId>jakarta.validation</groupId>
172-
<artifactId>jakarta.validation-api</artifactId>
171+
<groupId>javax.validation</groupId>
172+
<artifactId>validation-api</artifactId>
173173
</dependency>{{/useBeanValidation}}
174174
<dependency>
175-
<groupId>jakarta.annotation</groupId>
176-
<artifactId>jakarta.annotation-api</artifactId>
177-
<version>${jakarta-annotation.version}</version>
175+
<groupId>javax.annotation</groupId>
176+
<artifactId>javax.annotation-api</artifactId>
177+
<version>${javax-annotation.version}</version>
178178
<scope>provided</scope>
179179
</dependency>
180180
<dependency>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradleKts.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}}
7070

7171
{{#useBeanValidation}}
72-
implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}
73-
implementation("jakarta.annotation:jakarta.annotation-api:2.1.0")
72+
implementation("javax.validation:validation-api"){{/useBeanValidation}}
73+
implementation("javax.annotation:javax.annotation-api:1.3.2")
7474

7575
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
1414
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
1515
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
16-
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
16+
<javax-annotation.version>1.3.2</javax-annotation.version>
1717
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
1818

1919
<kotlin.version>1.6.21</kotlin.version>
@@ -191,13 +191,13 @@
191191
{{#useBeanValidation}}
192192
<!-- Bean Validation API support -->
193193
<dependency>
194-
<groupId>jakarta.validation</groupId>
195-
<artifactId>jakarta.validation-api</artifactId>
194+
<groupId>javax.validation</groupId>
195+
<artifactId>validation-api</artifactId>
196196
</dependency>{{/useBeanValidation}}
197197
<dependency>
198-
<groupId>jakarta.annotation</groupId>
199-
<artifactId>jakarta.annotation-api</artifactId>
200-
<version>${jakarta-annotation.version}</version>
198+
<groupId>javax.annotation</groupId>
199+
<artifactId>javax.annotation-api</artifactId>
200+
<version>${javax-annotation.version}</version>
201201
<scope>provided</scope>
202202
</dependency>
203203
<dependency>

‎samples/server/petstore/kotlin-spring-cloud/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
5858
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE")
5959

60-
implementation("jakarta.validation:jakarta.validation-api")
61-
implementation("jakarta.annotation:jakarta.annotation-api:2.1.0")
60+
implementation("javax.validation:validation-api")
61+
implementation("javax.annotation:javax.annotation-api:1.3.2")
6262

6363
}

‎samples/server/petstore/kotlin-spring-cloud/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>1.0.0</version>
88
<properties>
99
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
10-
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
10+
<javax-annotation.version>1.3.2</javax-annotation.version>
1111
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
1212

1313
<kotlin.version>1.6.21</kotlin.version>
@@ -119,13 +119,13 @@
119119
</dependency>
120120
<!-- Bean Validation API support -->
121121
<dependency>
122-
<groupId>jakarta.validation</groupId>
123-
<artifactId>jakarta.validation-api</artifactId>
122+
<groupId>javax.validation</groupId>
123+
<artifactId>validation-api</artifactId>
124124
</dependency>
125125
<dependency>
126-
<groupId>jakarta.annotation</groupId>
127-
<artifactId>jakarta.annotation-api</artifactId>
128-
<version>${jakarta-annotation.version}</version>
126+
<groupId>javax.annotation</groupId>
127+
<artifactId>javax.annotation-api</artifactId>
128+
<version>${javax-annotation.version}</version>
129129
<scope>provided</scope>
130130
</dependency>
131131
<dependency>

‎samples/server/petstore/kotlin-spring-default/build.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ dependencies {
4040
compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
4141
compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
4242
compile("com.fasterxml.jackson.module:jackson-module-kotlin")
43-
compile("jakarta.validation:jakarta.validation-api")
44-
compile("jakarta.annotation:jakarta.annotation-api:2.1.0")
45-
43+
compile("javax.validation:validation-api")
44+
compile("javax.annotation:javax.annotation-api:1.3.2")
4645
testCompile("org.jetbrains.kotlin:kotlin-test-junit5")
4746
testCompile("org.springframework.boot:spring-boot-starter-test") {
4847
exclude(module = "junit")

‎samples/server/petstore/kotlin-spring-default/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<properties>
99
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>
1010
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
11-
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
11+
<javax-annotation.version>1.3.2</javax-annotation.version>
1212
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
1313

1414
<kotlin.version>1.6.21</kotlin.version>
@@ -117,13 +117,13 @@
117117
</dependency>
118118
<!-- Bean Validation API support -->
119119
<dependency>
120-
<groupId>jakarta.validation</groupId>
121-
<artifactId>jakarta.validation-api</artifactId>
120+
<groupId>javax.validation</groupId>
121+
<artifactId>validation-api</artifactId>
122122
</dependency>
123123
<dependency>
124-
<groupId>jakarta.annotation</groupId>
125-
<artifactId>jakarta.annotation-api</artifactId>
126-
<version>${jakarta-annotation.version}</version>
124+
<groupId>javax.annotation</groupId>
125+
<artifactId>javax.annotation-api</artifactId>
126+
<version>${javax-annotation.version}</version>
127127
<scope>provided</scope>
128128
</dependency>
129129
<dependency>

‎samples/server/petstore/kotlin-springboot-bigdecimal-default/build.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ dependencies {
4040
compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
4141
compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
4242
compile("com.fasterxml.jackson.module:jackson-module-kotlin")
43-
compile("jakarta.validation:jakarta.validation-api")
44-
compile("jakarta.annotation:jakarta.annotation-api:2.1.0")
45-
43+
compile("javax.validation:validation-api")
44+
compile("javax.annotation:javax.annotation-api:1.3.2")
4645
testCompile("org.jetbrains.kotlin:kotlin-test-junit5")
4746
testCompile("org.springframework.boot:spring-boot-starter-test") {
4847
exclude(module = "junit")

‎samples/server/petstore/kotlin-springboot-bigdecimal-default/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<properties>
99
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>
1010
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
11-
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
11+
<javax-annotation.version>1.3.2</javax-annotation.version>
1212
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
1313

1414
<kotlin.version>1.6.21</kotlin.version>
@@ -117,13 +117,13 @@
117117
</dependency>
118118
<!-- Bean Validation API support -->
119119
<dependency>
120-
<groupId>jakarta.validation</groupId>
121-
<artifactId>jakarta.validation-api</artifactId>
120+
<groupId>javax.validation</groupId>
121+
<artifactId>validation-api</artifactId>
122122
</dependency>
123123
<dependency>
124-
<groupId>jakarta.annotation</groupId>
125-
<artifactId>jakarta.annotation-api</artifactId>
126-
<version>${jakarta-annotation.version}</version>
124+
<groupId>javax.annotation</groupId>
125+
<artifactId>javax.annotation-api</artifactId>
126+
<version>${javax-annotation.version}</version>
127127
<scope>provided</scope>
128128
</dependency>
129129
<dependency>

0 commit comments

Comments
 (0)