Skip to content

Commit 5fdcd48

Browse files
wing328andresesfm
wing328
and
andresesfm
authored
[okhttp-gson] migrate to jakarta.ws.rs (OpenAPITools#19113)
* javax.ws.rs:javax.ws.rs-api package was renamed on maven * update dependencies for java okhttp pom, build.sbt * update * update dep --------- Co-authored-by: Andres Aguilar <andresesfm@gmail.com>
1 parent 005d5b0 commit 5fdcd48

43 files changed

Lines changed: 152 additions & 249 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ dependencies {
116116
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
117117
implementation 'com.google.code.gson:gson:2.9.1'
118118
implementation 'io.gsonfire:gson-fire:1.9.0'
119-
implementation 'javax.ws.rs:jsr311-api:1.1.1'
120-
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
119+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
121120
{{#openApiNullable}}
122121
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
123122
{{/openApiNullable}}
@@ -135,9 +134,9 @@ dependencies {
135134
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
136135
{{/dynamicOperations}}
137136
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
138-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
137+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
139138
testImplementation 'org.mockito:mockito-core:3.12.4'
140-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
139+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
141140
}
142141

143142
javadoc {

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ lazy val root = (project in file(".")).
1414
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
1515
"com.google.code.gson" % "gson" % "2.9.1",
1616
"org.apache.commons" % "commons-lang3" % "3.12.0",
17-
"javax.ws.rs" % "jsr311-api" % "1.1.1",
18-
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
17+
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
1918
{{#openApiNullable}}
2019
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2120
{{/openApiNullable}}
@@ -35,7 +34,7 @@ lazy val root = (project in file(".")).
3534
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
3635
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
3736
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
38-
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
37+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
3938
"com.novocode" % "junit-interface" % "0.10" % "test",
4039
"org.mockito" % "mockito-core" % "3.12.4" % "test"
4140
)

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,9 @@
383383
</dependency>
384384
{{/withAWSV4Signature}}
385385
<dependency>
386-
<groupId>javax.ws.rs</groupId>
387-
<artifactId>jsr311-api</artifactId>
388-
<version>${jsr311-api-version}</version>
389-
</dependency>
390-
<dependency>
391-
<groupId>javax.ws.rs</groupId>
392-
<artifactId>javax.ws.rs-api</artifactId>
393-
<version>${javax.ws.rs-api-version}</version>
386+
<groupId>jakarta.ws.rs</groupId>
387+
<artifactId>jakarta.ws.rs-api</artifactId>
388+
<version>${jakarta.ws.rs-api-version}</version>
394389
</dependency>
395390
<!-- test dependencies -->
396391
<dependency>
@@ -438,9 +433,9 @@
438433
{{#useBeanValidation}}
439434
<beanvalidation-version>3.0.2</beanvalidation-version>
440435
{{/useBeanValidation}}
441-
<junit-version>5.10.2</junit-version>
436+
<junit-version>5.10.3</junit-version>
442437
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
443-
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
438+
<jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>
444439
<jsr311-api-version>1.1.1</jsr311-api-version>
445440
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
446441
<spotless.version>2.43.0</spotless.version>

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,14 @@ dependencies {
112112
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
113113
implementation 'com.google.code.gson:gson:2.9.1'
114114
implementation 'io.gsonfire:gson-fire:1.9.0'
115-
implementation 'javax.ws.rs:jsr311-api:1.1.1'
116-
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
115+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
117116
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
118117
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
119118
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
120119
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
121-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
120+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
122121
testImplementation 'org.mockito:mockito-core:3.12.4'
123-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
122+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
124123
}
125124

126125
javadoc {

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
1414
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
1515
"com.google.code.gson" % "gson" % "2.9.1",
1616
"org.apache.commons" % "commons-lang3" % "3.12.0",
17-
"javax.ws.rs" % "jsr311-api" % "1.1.1",
18-
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
17+
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
1918
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2019
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
2120
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
2221
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2322
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2423
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
25-
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
24+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
2625
"com.novocode" % "junit-interface" % "0.10" % "test",
2726
"org.mockito" % "mockito-core" % "3.12.4" % "test"
2827
)

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,14 +306,9 @@
306306
<version>${jackson-databind-nullable-version}</version>
307307
</dependency>
308308
<dependency>
309-
<groupId>javax.ws.rs</groupId>
310-
<artifactId>jsr311-api</artifactId>
311-
<version>${jsr311-api-version}</version>
312-
</dependency>
313-
<dependency>
314-
<groupId>javax.ws.rs</groupId>
315-
<artifactId>javax.ws.rs-api</artifactId>
316-
<version>${javax.ws.rs-api-version}</version>
309+
<groupId>jakarta.ws.rs</groupId>
310+
<artifactId>jakarta.ws.rs-api</artifactId>
311+
<version>${jakarta.ws.rs-api-version}</version>
317312
</dependency>
318313
<!-- test dependencies -->
319314
<dependency>
@@ -339,9 +334,9 @@
339334
<commons-lang3-version>3.14.0</commons-lang3-version>
340335
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
341336
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
342-
<junit-version>5.10.2</junit-version>
337+
<junit-version>5.10.3</junit-version>
343338
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
344-
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
339+
<jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>
345340
<jsr311-api-version>1.1.1</jsr311-api-version>
346341
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
347342
<spotless.version>2.43.0</spotless.version>

‎samples/client/echo_api/java/okhttp-gson/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,13 @@ dependencies {
112112
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
113113
implementation 'com.google.code.gson:gson:2.9.1'
114114
implementation 'io.gsonfire:gson-fire:1.9.0'
115-
implementation 'javax.ws.rs:jsr311-api:1.1.1'
116-
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
115+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
117116
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
118117
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
119118
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
120-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
119+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
121120
testImplementation 'org.mockito:mockito-core:3.12.4'
122-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
121+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
123122
}
124123

125124
javadoc {

‎samples/client/echo_api/java/okhttp-gson/build.sbt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ lazy val root = (project in file(".")).
1414
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
1515
"com.google.code.gson" % "gson" % "2.9.1",
1616
"org.apache.commons" % "commons-lang3" % "3.12.0",
17-
"javax.ws.rs" % "jsr311-api" % "1.1.1",
18-
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
17+
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
1918
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2019
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
2120
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2221
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2322
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
24-
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
23+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
2524
"com.novocode" % "junit-interface" % "0.10" % "test",
2625
"org.mockito" % "mockito-core" % "3.12.4" % "test"
2726
)

‎samples/client/echo_api/java/okhttp-gson/pom.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,14 +301,9 @@
301301
<version>${jackson-databind-nullable-version}</version>
302302
</dependency>
303303
<dependency>
304-
<groupId>javax.ws.rs</groupId>
305-
<artifactId>jsr311-api</artifactId>
306-
<version>${jsr311-api-version}</version>
307-
</dependency>
308-
<dependency>
309-
<groupId>javax.ws.rs</groupId>
310-
<artifactId>javax.ws.rs-api</artifactId>
311-
<version>${javax.ws.rs-api-version}</version>
304+
<groupId>jakarta.ws.rs</groupId>
305+
<artifactId>jakarta.ws.rs-api</artifactId>
306+
<version>${jakarta.ws.rs-api-version}</version>
312307
</dependency>
313308
<!-- test dependencies -->
314309
<dependency>
@@ -334,9 +329,9 @@
334329
<commons-lang3-version>3.14.0</commons-lang3-version>
335330
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
336331
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
337-
<junit-version>5.10.2</junit-version>
332+
<junit-version>5.10.3</junit-version>
338333
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
339-
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
334+
<jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>
340335
<jsr311-api-version>1.1.1</jsr311-api-version>
341336
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
342337
<spotless.version>2.43.0</spotless.version>

‎samples/client/others/java/okhttp-gson-oneOf/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,13 @@ dependencies {
112112
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
113113
implementation 'com.google.code.gson:gson:2.9.1'
114114
implementation 'io.gsonfire:gson-fire:1.9.0'
115-
implementation 'javax.ws.rs:jsr311-api:1.1.1'
116-
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
115+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
117116
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
118117
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
119118
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
120-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
119+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
121120
testImplementation 'org.mockito:mockito-core:3.12.4'
122-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
121+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
123122
}
124123

125124
javadoc {

0 commit comments

Comments
 (0)