diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 859d322d08ea..eb67fc112409 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -116,8 +116,7 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
{{#openApiNullable}}
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
{{/openApiNullable}}
@@ -135,9 +134,9 @@ dependencies {
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
{{/dynamicOperations}}
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index 68d9e7fc8efa..2045b84742e3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -14,8 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
{{#openApiNullable}}
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
{{/openApiNullable}}
@@ -35,7 +34,7 @@ lazy val root = (project in file(".")).
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index f38837360cae..def53f2fc2ad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -383,14 +383,9 @@
{{/withAWSV4Signature}}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -438,9 +433,9 @@
{{#useBeanValidation}}
3.0.2
{{/useBeanValidation}}
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle
index ba29ee2b2f74..676e8c999a0e 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt
index cef996ca186a..41a2d93764c2 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml
index e45b5a340e63..c8559aa93a36 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml
@@ -306,14 +306,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -339,9 +334,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/echo_api/java/okhttp-gson/build.gradle b/samples/client/echo_api/java/okhttp-gson/build.gradle
index 3d38f68764d2..1f433364a3a5 100644
--- a/samples/client/echo_api/java/okhttp-gson/build.gradle
+++ b/samples/client/echo_api/java/okhttp-gson/build.gradle
@@ -112,14 +112,13 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/echo_api/java/okhttp-gson/build.sbt b/samples/client/echo_api/java/okhttp-gson/build.sbt
index 7ea5b0cb5607..12ac2795172e 100644
--- a/samples/client/echo_api/java/okhttp-gson/build.sbt
+++ b/samples/client/echo_api/java/okhttp-gson/build.sbt
@@ -14,14 +14,13 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/echo_api/java/okhttp-gson/pom.xml b/samples/client/echo_api/java/okhttp-gson/pom.xml
index 55a4e0aa09b5..b7a41cebfbb6 100644
--- a/samples/client/echo_api/java/okhttp-gson/pom.xml
+++ b/samples/client/echo_api/java/okhttp-gson/pom.xml
@@ -301,14 +301,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -334,9 +329,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/others/java/okhttp-gson-oneOf/build.gradle b/samples/client/others/java/okhttp-gson-oneOf/build.gradle
index 06b2fd80c4c2..d1dc4ac2a571 100644
--- a/samples/client/others/java/okhttp-gson-oneOf/build.gradle
+++ b/samples/client/others/java/okhttp-gson-oneOf/build.gradle
@@ -112,14 +112,13 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/others/java/okhttp-gson-oneOf/build.sbt b/samples/client/others/java/okhttp-gson-oneOf/build.sbt
index 5aea48501a09..ecdac6b908f2 100644
--- a/samples/client/others/java/okhttp-gson-oneOf/build.sbt
+++ b/samples/client/others/java/okhttp-gson-oneOf/build.sbt
@@ -14,14 +14,13 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/others/java/okhttp-gson-oneOf/pom.xml b/samples/client/others/java/okhttp-gson-oneOf/pom.xml
index f5c192c91515..dd68d59ceee6 100644
--- a/samples/client/others/java/okhttp-gson-oneOf/pom.xml
+++ b/samples/client/others/java/okhttp-gson-oneOf/pom.xml
@@ -301,14 +301,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -334,9 +329,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/others/java/okhttp-gson-streaming/build.gradle b/samples/client/others/java/okhttp-gson-streaming/build.gradle
index de95fe59eb4b..b454a3a81321 100644
--- a/samples/client/others/java/okhttp-gson-streaming/build.gradle
+++ b/samples/client/others/java/okhttp-gson-streaming/build.gradle
@@ -112,14 +112,13 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/others/java/okhttp-gson-streaming/build.sbt b/samples/client/others/java/okhttp-gson-streaming/build.sbt
index 43dc93b58620..b776f34e427a 100644
--- a/samples/client/others/java/okhttp-gson-streaming/build.sbt
+++ b/samples/client/others/java/okhttp-gson-streaming/build.sbt
@@ -14,14 +14,13 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/others/java/okhttp-gson-streaming/pom.xml b/samples/client/others/java/okhttp-gson-streaming/pom.xml
index bb46b05bbee6..0904061dbb92 100644
--- a/samples/client/others/java/okhttp-gson-streaming/pom.xml
+++ b/samples/client/others/java/okhttp-gson-streaming/pom.xml
@@ -301,14 +301,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -334,9 +329,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/build.gradle b/samples/client/petstore/java/okhttp-gson-3.1/build.gradle
index 9c49711c900d..f2a6e8e06eb7 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-3.1/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/build.sbt b/samples/client/petstore/java/okhttp-gson-3.1/build.sbt
index 6d08084ea4a2..fc99baef382c 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-3.1/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/pom.xml b/samples/client/petstore/java/okhttp-gson-3.1/pom.xml
index 4da8ba066f4f..cad8858e1326 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-3.1/pom.xml
@@ -306,14 +306,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -339,9 +334,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
index bf28eaab47a0..9efe9b9f0a0e 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
@@ -112,16 +112,15 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation 'software.amazon.awssdk:auth:2.20.157'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt
index 83d5a9f45c08..993651032ca7 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt
@@ -14,8 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"software.amazon.awssdk" % "auth" % "2.20.157",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
@@ -23,7 +22,7 @@ lazy val root = (project in file(".")).
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml b/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml
index 45d1d0f16ee9..4432d2ac1c6b 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml
@@ -311,14 +311,9 @@
2.20.157
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -344,9 +339,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
index 53abcdebd4b1..df040d5aac19 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
@@ -112,16 +112,15 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt
index 99d8419f18f1..fe2edb8e3f11 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt
@@ -14,8 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.swagger.parser.v3" % "swagger-parser-v3" "2.0.30" % "compile"
@@ -23,7 +22,7 @@ lazy val root = (project in file(".")).
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
index 3f7d274da619..c328e7c432d5 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
@@ -311,14 +311,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -344,9 +339,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle b/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle
index 0b538e51b8c2..23a62038557c 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt b/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt
index 986fec5f5794..824632fc6621 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml b/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml
index 3a76449b874c..aefb903304f2 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml
@@ -306,14 +306,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -339,9 +334,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle b/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle
index c9e122aff311..d52a031af35f 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt b/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt
index 342822d7ac97..f0b139580df4 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml b/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml
index 5a595c33fdbd..c9f7368ef833 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml
@@ -306,14 +306,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -339,9 +334,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
index ea4e98857eaa..51ba39863b41 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
index 6d8a20396b6c..f93a3516af95 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
index a714642ec5f6..969ae65f70e1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -313,14 +313,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -346,9 +341,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
index 67dd0df27bdc..5ce050edbdd4 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt b/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt
index 982b47d29805..ce7b54dda966 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml b/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml
index 465298fd9c11..c91c33c44b5c 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml
@@ -311,14 +311,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -345,9 +340,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
index 67dd0df27bdc..5ce050edbdd4 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt b/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt
index 982b47d29805..ce7b54dda966 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml b/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml
index b4398077ab70..969ea3012fd1 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml
@@ -311,14 +311,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -345,9 +340,9 @@
3.14.0
0.2.6
1.3.5
- 5.10.2
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
2.43.0
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore b/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore
index fcc3c36a6e5e..7a5d6d2e1b54 100644
--- a/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore
+++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator-ignore
@@ -11,4 +11,5 @@ src/test/java/org/openapitools/client/model/PetTest.java
src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
src/test/java/org/openapitools/client/JSONTest.java
src/test/java/org/openapitools/client/api/PetApiTest.java
-pom.xml
+# to manually include mockito-core in pom.xml
+pom.xml
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index 67dd0df27bdc..5ce050edbdd4 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -112,15 +112,14 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'io.gsonfire:gson-fire:1.9.0'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index 982b47d29805..ce7b54dda966 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -14,15 +14,14 @@ lazy val root = (project in file(".")).
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 5bd5c322feee..5f7a29c64c65 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -50,7 +50,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.1.0
+ 3.4.1
enforce-maven
@@ -72,12 +72,12 @@
maven-surefire-plugin
2.22.2
-
+
loggerPath
conf/log4j.properties
-
+
-Xms512m -Xmx1500m
methods
10
@@ -93,7 +93,7 @@
maven-dependency-plugin
- 3.3.0
+ 3.6.1
package
@@ -124,7 +124,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.5.0
add_sources
@@ -155,7 +155,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.4.1
+ 3.6.3
attach-javadocs
@@ -178,7 +178,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.0
attach-sources
@@ -241,7 +241,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 3.0.1
+ 3.2.1
sign-artifacts
@@ -306,14 +306,9 @@
${jackson-databind-nullable-version}
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -343,14 +338,14 @@
1.9.0
4.11.0
2.10.1
- 3.13.0
+ 3.14.0
0.2.6
1.3.5
- 5.10.0
+ 5.10.3
1.10.0
- 2.1.1
+ 2.1.6
1.1.1
UTF-8
- 2.27.2
+ 2.43.0