Skip to content

Commit adc347c

Browse files
wing328wing328
committed
update dependencies for java okhttp pom, build.sbt
1 parent 0349e87 commit adc347c

File tree

40 files changed

+79
-171
lines changed

40 files changed

+79
-171
lines changed

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

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
1918
{{#openApiNullable}}
2019
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2120
{{/openApiNullable}}

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

+4-9
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>jakarate.ws.rs</groupId>
387+
<artifactId>jakarata.ws.rs-api</artifactId>
388+
<version>${jakarata.ws.rs-api-version}</version>
394389
</dependency>
395390
<!-- test dependencies -->
396391
<dependency>
@@ -440,7 +435,7 @@
440435
{{/useBeanValidation}}
441436
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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'

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

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

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

+4-9
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>jakarate.ws.rs</groupId>
310+
<artifactId>jakarata.ws.rs-api</artifactId>
311+
<version>${jakarata.ws.rs-api-version}</version>
317312
</dependency>
318313
<!-- test dependencies -->
319314
<dependency>
@@ -341,7 +336,7 @@
341336
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
342337
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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"

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

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

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

+4-9
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>jakarate.ws.rs</groupId>
305+
<artifactId>jakarata.ws.rs-api</artifactId>
306+
<version>${jakarata.ws.rs-api-version}</version>
312307
</dependency>
313308
<!-- test dependencies -->
314309
<dependency>
@@ -336,7 +331,7 @@
336331
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
337332
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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"

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

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

‎samples/client/others/java/okhttp-gson-oneOf/pom.xml

+4-9
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>jakarate.ws.rs</groupId>
305+
<artifactId>jakarata.ws.rs-api</artifactId>
306+
<version>${jakarata.ws.rs-api-version}</version>
312307
</dependency>
313308
<!-- test dependencies -->
314309
<dependency>
@@ -336,7 +331,7 @@
336331
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
337332
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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-streaming/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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"

‎samples/client/others/java/okhttp-gson-streaming/build.sbt

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

‎samples/client/others/java/okhttp-gson-streaming/pom.xml

+4-9
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>jakarate.ws.rs</groupId>
305+
<artifactId>jakarata.ws.rs-api</artifactId>
306+
<version>${jakarata.ws.rs-api-version}</version>
312307
</dependency>
313308
<!-- test dependencies -->
314309
<dependency>
@@ -336,7 +331,7 @@
336331
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
337332
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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/petstore/java/okhttp-gson-3.1/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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'

‎samples/client/petstore/java/okhttp-gson-3.1/build.sbt

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

‎samples/client/petstore/java/okhttp-gson-3.1/pom.xml

+4-9
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>jakarate.ws.rs</groupId>
310+
<artifactId>jakarata.ws.rs-api</artifactId>
311+
<version>${jakarata.ws.rs-api-version}</version>
317312
</dependency>
318313
<!-- test dependencies -->
319314
<dependency>
@@ -341,7 +336,7 @@
341336
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
342337
<junit-version>5.10.2</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+
<javax.ws.rs-api-version>2.1.2</javax.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/petstore/java/okhttp-gson-awsv4signature/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
117116
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
118117
implementation 'software.amazon.awssdk:auth:2.20.157'
119118
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'

‎samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
1918
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2019
"software.amazon.awssdk" % "auth" % "2.20.157",
2120
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",

‎samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml

+4-9
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,9 @@
311311
<version>2.20.157</version>
312312
</dependency>
313313
<dependency>
314-
<groupId>javax.ws.rs</groupId>
315-
<artifactId>jsr311-api</artifactId>
316-
<version>${jsr311-api-version}</version>
317-
</dependency>
318-
<dependency>
319-
<groupId>javax.ws.rs</groupId>
320-
<artifactId>javax.ws.rs-api</artifactId>
321-
<version>${javax.ws.rs-api-version}</version>
314+
<groupId>jakarate.ws.rs</groupId>
315+
<artifactId>jakarata.ws.rs-api</artifactId>
316+
<version>${jakarata.ws.rs-api-version}</version>
322317
</dependency>
323318
<!-- test dependencies -->
324319
<dependency>
@@ -346,7 +341,7 @@
346341
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
347342
<junit-version>5.10.2</junit-version>
348343
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
349-
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
344+
<javax.ws.rs-api-version>2.1.2</javax.ws.rs-api-version>
350345
<jsr311-api-version>1.1.1</jsr311-api-version>
351346
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
352347
<spotless.version>2.43.0</spotless.version>

‎samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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'

‎samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
1918
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
2019
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
2120
"io.swagger.parser.v3" % "swagger-parser-v3" "2.0.30" % "compile"

‎samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml

+4-9
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,9 @@
311311
<version>${jackson-databind-nullable-version}</version>
312312
</dependency>
313313
<dependency>
314-
<groupId>javax.ws.rs</groupId>
315-
<artifactId>jsr311-api</artifactId>
316-
<version>${jsr311-api-version}</version>
317-
</dependency>
318-
<dependency>
319-
<groupId>javax.ws.rs</groupId>
320-
<artifactId>javax.ws.rs-api</artifactId>
321-
<version>${javax.ws.rs-api-version}</version>
314+
<groupId>jakarate.ws.rs</groupId>
315+
<artifactId>jakarata.ws.rs-api</artifactId>
316+
<version>${jakarata.ws.rs-api-version}</version>
322317
</dependency>
323318
<!-- test dependencies -->
324319
<dependency>
@@ -346,7 +341,7 @@
346341
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
347342
<junit-version>5.10.2</junit-version>
348343
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
349-
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
344+
<javax.ws.rs-api-version>2.1.2</javax.ws.rs-api-version>
350345
<jsr311-api-version>1.1.1</jsr311-api-version>
351346
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
352347
<spotless.version>2.43.0</spotless.version>

‎samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ 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.2'
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'

‎samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt

+1-2
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+
"jakarata.ws.rs" % "javax.ws.rs-api" % "2.1.2",
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",

0 commit comments

Comments
 (0)