From 46a2f55383c5590b5ac71edbc153895fd34b9cf0 Mon Sep 17 00:00:00 2001
From: Steven Blakowski <145432856+steven-blakowski@users.noreply.github.com>
Date: Fri, 13 Jun 2025 15:10:24 +0200
Subject: [PATCH 1/2] [Java][resttemplate] fix spring-web dependency for gradle
 without jakarta enabled

---
 .../workflows/samples-java-client-jdk11.yaml  | 23 ++++++++++++++++++-
 .../apache-httpclient/build.gradle.mustache   |  4 ++--
 .../libraries/jersey2/build.gradle.mustache   | 12 +++++++++-
 .../okhttp-gson/build.gradle.mustache         | 19 ++++++++++++++-
 .../resttemplate/build.gradle.mustache        | 12 ++++++----
 .../libraries/retrofit2/build.gradle.mustache |  2 +-
 .../echo_api/java/resttemplate/build.gradle   |  2 +-
 .../client/echo_api/kotlin-jvm-okhttp/gradlew |  0
 .../kotlin-jvm-spring-3-restclient/gradlew    |  0
 .../kotlin-jvm-spring-3-webclient/gradlew     |  0
 .../kotlin-model-prefix-type-mappings/gradlew |  0
 .../others/java/jersey2-oneOf-Mixed/gradlew   |  0
 .../java/jersey2-oneOf-duplicates/gradlew     |  0
 .../java/okhttp-gson-oneOf-array/build.gradle |  2 ++
 .../java/okhttp-gson-oneOf-array/gradlew      |  0
 .../others/java/okhttp-gson-oneOf/gradlew     |  0
 .../others/java/okhttp-gson-streaming/gradlew |  0
 .../restclient-useAbstractionForFiles/gradlew |  0
 .../build.gradle                              |  5 ++--
 .../gradlew                                   |  0
 .../build.gradle                              |  2 +-
 .../gradlew                                   |  0
 .../webclient-useAbstractionForFiles/gradlew  |  0
 .../gradlew                                   |  0
 .../kotlin-jvm-okhttp-parameter-tests/gradlew |  0
 .../kotlin-jvm-okhttp-path-comments/gradlew   |  0
 .../java/apache-httpclient/build.gradle       |  4 ++--
 .../petstore/java/apache-httpclient/gradlew   |  0
 .../client/petstore/java/feign-hc5/gradlew    |  0
 .../java/jersey2-java8-localdatetime/gradlew  |  0
 .../petstore/java/jersey2-java8/gradlew       |  0
 .../petstore/java/jersey3-oneOf/gradlew       |  0
 samples/client/petstore/java/jersey3/gradlew  |  0
 .../petstore/java/native-jakarta/gradlew      |  0
 .../gradlew                                   |  0
 .../petstore/java/okhttp-gson-3.1/gradlew     |  0
 .../java/okhttp-gson-awsv4signature/gradlew   |  0
 .../java/okhttp-gson-group-parameter/gradlew  |  0
 .../okhttp-gson-nullable-required/gradlew     |  0
 .../java/okhttp-gson-parcelableModel/gradlew  |  0
 .../java/okhttp-gson-swagger1/gradlew         |  0
 .../java/okhttp-gson-swagger2/build.gradle    |  3 ++-
 .../java/okhttp-gson-swagger2/gradlew         |  0
 .../client/petstore/java/okhttp-gson/gradlew  |  0
 .../java/resttemplate-jakarta/build.gradle    |  2 +-
 .../java/resttemplate-swagger1/build.gradle   |  2 +-
 .../java/resttemplate-swagger1/gradlew        |  0
 .../java/resttemplate-swagger2/build.gradle   |  2 +-
 .../java/resttemplate-swagger2/gradlew        |  0
 .../java/resttemplate-withXml/build.gradle    |  3 ++-
 .../petstore/java/resttemplate/build.gradle   |  2 +-
 .../petstore/java/retrofit2rx3/build.gradle   |  2 +-
 .../java/vertx-supportVertxFuture/gradlew     |  0
 .../java/webclient-nullable-arrays/gradlew    |  0
 .../petstore/java/webclient-swagger2/gradlew  |  0
 .../client/petstore/java/webclient/gradlew    |  0
 .../jersey2-java8-special-characters/gradlew  |  0
 .../java/jersey2-java8-swagger1/gradlew       |  0
 .../java/jersey2-java8-swagger2/build.gradle  |  4 ++--
 .../java/jersey2-java8-swagger2/gradlew       |  0
 .../petstore/java/jersey2-java8/gradlew       |  0
 61 files changed, 82 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 samples/client/echo_api/kotlin-jvm-okhttp/gradlew
 mode change 100644 => 100755 samples/client/echo_api/kotlin-jvm-spring-3-restclient/gradlew
 mode change 100644 => 100755 samples/client/echo_api/kotlin-jvm-spring-3-webclient/gradlew
 mode change 100644 => 100755 samples/client/echo_api/kotlin-model-prefix-type-mappings/gradlew
 mode change 100644 => 100755 samples/client/others/java/jersey2-oneOf-Mixed/gradlew
 mode change 100644 => 100755 samples/client/others/java/jersey2-oneOf-duplicates/gradlew
 mode change 100644 => 100755 samples/client/others/java/okhttp-gson-oneOf-array/gradlew
 mode change 100644 => 100755 samples/client/others/java/okhttp-gson-oneOf/gradlew
 mode change 100644 => 100755 samples/client/others/java/okhttp-gson-streaming/gradlew
 mode change 100644 => 100755 samples/client/others/java/restclient-useAbstractionForFiles/gradlew
 mode change 100644 => 100755 samples/client/others/java/resttemplate-list-schema-validation/gradlew
 mode change 100644 => 100755 samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew
 mode change 100644 => 100755 samples/client/others/java/webclient-useAbstractionForFiles/gradlew
 mode change 100644 => 100755 samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/gradlew
 mode change 100644 => 100755 samples/client/others/kotlin-jvm-okhttp-parameter-tests/gradlew
 mode change 100644 => 100755 samples/client/others/kotlin-jvm-okhttp-path-comments/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/apache-httpclient/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/feign-hc5/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/jersey2-java8-localdatetime/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/jersey2-java8/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/jersey3-oneOf/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/jersey3/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/native-jakarta/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-3.1/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-awsv4signature/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-group-parameter/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-nullable-required/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-parcelableModel/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-swagger1/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson-swagger2/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/okhttp-gson/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/resttemplate-swagger1/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/resttemplate-swagger2/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/vertx-supportVertxFuture/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/webclient-nullable-arrays/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/webclient-swagger2/gradlew
 mode change 100644 => 100755 samples/client/petstore/java/webclient/gradlew
 mode change 100644 => 100755 samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradlew
 mode change 100644 => 100755 samples/openapi3/client/petstore/java/jersey2-java8-swagger1/gradlew
 mode change 100644 => 100755 samples/openapi3/client/petstore/java/jersey2-java8-swagger2/gradlew
 mode change 100644 => 100755 samples/openapi3/client/petstore/java/jersey2-java8/gradlew

diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml
index baedba93944f..66204b46cbcb 100644
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -110,6 +110,27 @@ jobs:
           path: |
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-      - name: Build
+      - name: Build with Maven
         working-directory: ${{ matrix.sample }}
         run: mvn clean package --no-transfer-progress
+
+      - name: Cache gradle dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-caches
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+
+      - name: Cache gradle wrapper
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-wrapper
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build with Gradle
+        working-directory: ${{ matrix.sample }}
+        if: ${{ hashFiles('./gradlew') != '' }}
+        run: ./gradlew build -x test
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
index f18581f08ba1..7a2ea0733700 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from sourceSets.main.allSource
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from javadoc.destinationDir
     }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index ca6ae2abe01e..d7a4443e35f8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -98,7 +98,12 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
+    {{#swagger1AnnotationLibrary}}
+    swagger_annotations_version = "1.6.6"
+    {{/swagger1AnnotationLibrary}}
+    {{#swagger2AnnotationLibrary}}
+    swagger_annotations_version = "2.2.15"
+    {{/swagger2AnnotationLibrary}}
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     {{#openApiNullable}}
@@ -122,7 +127,12 @@ ext {
 }
 
 dependencies {
+    {{#swagger1AnnotationLibrary}}
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
+    {{/swagger1AnnotationLibrary}}
+    {{#swagger2AnnotationLibrary}}
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
+    {{/swagger2AnnotationLibrary}}
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
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 1b527257ae0f..062ef2b9ee6f 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
@@ -106,11 +106,25 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
+    {{#swagger1AnnotationLibrary}}
+    swagger_annotations_version = "1.6.9"
+    {{/swagger1AnnotationLibrary}}
+    {{#swagger2AnnotationLibrary}}
+    swagger_annotations_version = "2.2.9"
+    {{/swagger2AnnotationLibrary}}
     jakarta_annotation_version = "1.3.5"
+    {{#useBeanValidation}}
+    bean_validation_version = "2.0.2"
+    {{/useBeanValidation}}
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
+    {{#swagger1AnnotationLibrary}}
+    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
+    {{/swagger1AnnotationLibrary}}
+    {{#swagger2AnnotationLibrary}}
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
+    {{/swagger2AnnotationLibrary}}
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
@@ -134,6 +148,9 @@ dependencies {
     implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
     {{/dynamicOperations}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    {{#useBeanValidation}}
+    implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
+    {{/useBeanValidation}}
     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.3'
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index 4091cf6a37ee..ca0ce4ca90d7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -121,14 +121,14 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     {{/openApiNullable}}
     {{#useJakartaEe}}
-    spring_web_version = "6.1.5"
+    spring_web_version = "6.2.8"
     jakarta_annotation_version = "2.1.1"
-    beanvalidation_version = "3.0.2"
+    bean_validation_version = "3.0.2"
     {{/useJakartaEe}}
     {{^useJakartaEe}}
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     {{/useJakartaEe}}
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
@@ -163,8 +163,12 @@ dependencies {
     {{/joda}}
     {{#withXml}}
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
+    implementation "io.github.threeten-jaxb:threeten-jaxb-core:1.2"
     {{/withXml}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    {{#useBeanValidation}}
+    implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
+    {{/useBeanValidation}}
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 407e97a335e6..1a8db344c516 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -134,7 +134,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
     {{/useRxJava2}}
     {{#useRxJava3}}
-    implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
+    implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
     implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
     {{/useRxJava3}}
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
diff --git a/samples/client/echo_api/java/resttemplate/build.gradle b/samples/client/echo_api/java/resttemplate/build.gradle
index 6246d69bfbaf..9ab05db18345 100644
--- a/samples/client/echo_api/java/resttemplate/build.gradle
+++ b/samples/client/echo_api/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/gradlew b/samples/client/echo_api/kotlin-jvm-okhttp/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/gradlew b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/gradlew b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/echo_api/kotlin-model-prefix-type-mappings/gradlew b/samples/client/echo_api/kotlin-model-prefix-type-mappings/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/gradlew b/samples/client/others/java/jersey2-oneOf-Mixed/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/gradlew b/samples/client/others/java/jersey2-oneOf-duplicates/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle b/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
index d96f6d99d885..e7a6b673223a 100644
--- a/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
+++ b/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
@@ -103,6 +103,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     jakarta_annotation_version = "1.3.5"
+    bean_validation_version = "2.0.2"
 }
 
 dependencies {
@@ -116,6 +117,7 @@ dependencies {
     implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     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.3'
diff --git a/samples/client/others/java/okhttp-gson-oneOf-array/gradlew b/samples/client/others/java/okhttp-gson-oneOf-array/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/okhttp-gson-oneOf/gradlew b/samples/client/others/java/okhttp-gson-oneOf/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/okhttp-gson-streaming/gradlew b/samples/client/others/java/okhttp-gson-streaming/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/gradlew b/samples/client/others/java/restclient-useAbstractionForFiles/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/resttemplate-list-schema-validation/build.gradle b/samples/client/others/java/resttemplate-list-schema-validation/build.gradle
index de3ff4db3a7b..a8152d6ebc5f 100644
--- a/samples/client/others/java/resttemplate-list-schema-validation/build.gradle
+++ b/samples/client/others/java/resttemplate-list-schema-validation/build.gradle
@@ -100,9 +100,9 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
@@ -118,6 +118,7 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }
diff --git a/samples/client/others/java/resttemplate-list-schema-validation/gradlew b/samples/client/others/java/resttemplate-list-schema-validation/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
index e1f3a76cafd4..b940117be525 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
+++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew b/samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/java/webclient-useAbstractionForFiles/gradlew b/samples/client/others/java/webclient-useAbstractionForFiles/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/gradlew b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/gradlew b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/gradlew b/samples/client/others/kotlin-jvm-okhttp-path-comments/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/apache-httpclient/build.gradle b/samples/client/petstore/java/apache-httpclient/build.gradle
index 1fa4cfce22c4..64642e1ccdae 100644
--- a/samples/client/petstore/java/apache-httpclient/build.gradle
+++ b/samples/client/petstore/java/apache-httpclient/build.gradle
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from sourceSets.main.allSource
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from javadoc.destinationDir
     }
 
diff --git a/samples/client/petstore/java/apache-httpclient/gradlew b/samples/client/petstore/java/apache-httpclient/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/feign-hc5/gradlew b/samples/client/petstore/java/feign-hc5/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/gradlew b/samples/client/petstore/java/jersey2-java8-localdatetime/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/jersey2-java8/gradlew b/samples/client/petstore/java/jersey2-java8/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/jersey3-oneOf/gradlew b/samples/client/petstore/java/jersey3-oneOf/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/jersey3/gradlew b/samples/client/petstore/java/jersey3/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/native-jakarta/gradlew b/samples/client/petstore/java/native-jakarta/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/gradlew b/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/gradlew b/samples/client/petstore/java/okhttp-gson-3.1/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/gradlew b/samples/client/petstore/java/okhttp-gson-awsv4signature/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/gradlew b/samples/client/petstore/java/okhttp-gson-group-parameter/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/gradlew b/samples/client/petstore/java/okhttp-gson-nullable-required/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/gradlew b/samples/client/petstore/java/okhttp-gson-parcelableModel/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/gradlew b/samples/client/petstore/java/okhttp-gson-swagger1/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
index bfee284c1c6f..74a7f852de9d 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle
@@ -102,11 +102,12 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
+    swagger_annotations_version = "2.2.9"
     jakarta_annotation_version = "1.3.5"
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/gradlew b/samples/client/petstore/java/okhttp-gson-swagger2/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/okhttp-gson/gradlew b/samples/client/petstore/java/okhttp-gson/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/resttemplate-jakarta/build.gradle b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
index b4530c64a7fa..f72bd78eabf4 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/build.gradle
+++ b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.5"
+    spring_web_version = "6.1.20"
     jakarta_annotation_version = "2.1.1"
     beanvalidation_version = "3.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
index 595a28d220ac..903eb4f522f6 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-swagger1/gradlew b/samples/client/petstore/java/resttemplate-swagger1/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/resttemplate-swagger2/build.gradle b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
index f0eca34f09d7..bf41a5be2312 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/resttemplate-swagger2/gradlew b/samples/client/petstore/java/resttemplate-swagger2/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index 5c4bccff011c..9e76d3dde589 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
@@ -118,6 +118,7 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
+    implementation "io.github.threeten-jaxb:threeten-jaxb-core:1.2"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index 1f4e2c0eda99..7925740c3112 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.2.8"
+    spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
     beanvalidation_version = "2.0.2"
     jodatime_version = "2.9.9"
diff --git a/samples/client/petstore/java/retrofit2rx3/build.gradle b/samples/client/petstore/java/retrofit2rx3/build.gradle
index 3968dccaec72..074acd96462b 100644
--- a/samples/client/petstore/java/retrofit2rx3/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx3/build.gradle
@@ -110,7 +110,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
+    implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
     implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/gradlew b/samples/client/petstore/java/vertx-supportVertxFuture/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/webclient-nullable-arrays/gradlew b/samples/client/petstore/java/webclient-nullable-arrays/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/webclient-swagger2/gradlew b/samples/client/petstore/java/webclient-swagger2/gradlew
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/java/webclient/gradlew b/samples/client/petstore/java/webclient/gradlew
old mode 100644
new mode 100755
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradlew b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradlew
old mode 100644
new mode 100755
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/gradlew b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/gradlew
old mode 100644
new mode 100755
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/build.gradle
index b3bfa1c7fbbf..5b55cf9dcad0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/build.gradle
@@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
+    swagger_annotations_version = "2.2.15"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -109,7 +109,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/gradlew b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/gradlew
old mode 100644
new mode 100755
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/gradlew b/samples/openapi3/client/petstore/java/jersey2-java8/gradlew
old mode 100644
new mode 100755

From 8fd33f8a74bf1bd0bcc19b8e3166c9e46cf61c83 Mon Sep 17 00:00:00 2001
From: Steven Blakowski <145432856+steven-blakowski@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:39:43 +0200
Subject: [PATCH 2/2] fix samples

---
 samples/client/echo_api/java/apache-httpclient/build.gradle   | 4 ++--
 .../java/okhttp-gson-user-defined-templates/build.gradle      | 1 -
 samples/client/echo_api/java/okhttp-gson/build.gradle         | 1 -
 samples/client/echo_api/java/resttemplate/build.gradle        | 2 +-
 samples/client/others/java/jersey2-oneOf-Mixed/build.gradle   | 2 --
 .../client/others/java/jersey2-oneOf-duplicates/build.gradle  | 2 --
 .../client/others/java/okhttp-gson-oneOf-array/build.gradle   | 1 -
 samples/client/others/java/okhttp-gson-oneOf/build.gradle     | 1 -
 samples/client/others/java/okhttp-gson-streaming/build.gradle | 1 -
 .../java/resttemplate-useAbstractionForFiles/build.gradle     | 2 +-
 .../petstore/java/jersey2-java8-localdatetime/build.gradle    | 2 --
 samples/client/petstore/java/jersey2-java8/build.gradle       | 2 --
 .../java/okhttp-gson-3.1-duplicated-operationid/build.gradle  | 1 -
 samples/client/petstore/java/okhttp-gson-3.1/build.gradle     | 1 -
 .../petstore/java/okhttp-gson-awsv4signature/build.gradle     | 1 -
 .../petstore/java/okhttp-gson-dynamicOperations/build.gradle  | 1 -
 .../petstore/java/okhttp-gson-group-parameter/build.gradle    | 1 -
 .../petstore/java/okhttp-gson-nullable-required/build.gradle  | 1 -
 .../petstore/java/okhttp-gson-parcelableModel/build.gradle    | 1 -
 .../client/petstore/java/okhttp-gson-swagger1/build.gradle    | 3 ++-
 samples/client/petstore/java/okhttp-gson/build.gradle         | 1 -
 .../client/petstore/java/resttemplate-jakarta/build.gradle    | 4 ++--
 .../client/petstore/java/resttemplate-swagger1/build.gradle   | 2 +-
 .../client/petstore/java/resttemplate-swagger2/build.gradle   | 2 +-
 .../client/petstore/java/resttemplate-withXml/build.gradle    | 2 +-
 samples/client/petstore/java/resttemplate/build.gradle        | 2 +-
 .../x-auth-id-alias/java/jersey2-java8/build.gradle           | 2 --
 .../java/jersey2-java8-special-characters/build.gradle        | 2 --
 .../client/petstore/java/jersey2-java8-swagger1/build.gradle  | 2 +-
 .../openapi3/client/petstore/java/jersey2-java8/build.gradle  | 2 --
 30 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/samples/client/echo_api/java/apache-httpclient/build.gradle b/samples/client/echo_api/java/apache-httpclient/build.gradle
index 42a22e07b4aa..2fef6e989be4 100644
--- a/samples/client/echo_api/java/apache-httpclient/build.gradle
+++ b/samples/client/echo_api/java/apache-httpclient/build.gradle
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from sourceSets.main.allSource
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from javadoc.destinationDir
     }
 
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 2d1609df2afc..8d57b75a1b3c 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
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/echo_api/java/okhttp-gson/build.gradle b/samples/client/echo_api/java/okhttp-gson/build.gradle
index ac77e86d715c..bda453776206 100644
--- a/samples/client/echo_api/java/okhttp-gson/build.gradle
+++ b/samples/client/echo_api/java/okhttp-gson/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/echo_api/java/resttemplate/build.gradle b/samples/client/echo_api/java/resttemplate/build.gradle
index 9ab05db18345..6d36aa773952 100644
--- a/samples/client/echo_api/java/resttemplate/build.gradle
+++ b/samples/client/echo_api/java/resttemplate/build.gradle
@@ -102,7 +102,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/build.gradle b/samples/client/others/java/jersey2-oneOf-Mixed/build.gradle
index 2b41fd98da24..1034f1adfec9 100644
--- a/samples/client/others/java/jersey2-oneOf-Mixed/build.gradle
+++ b/samples/client/others/java/jersey2-oneOf-Mixed/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/build.gradle b/samples/client/others/java/jersey2-oneOf-duplicates/build.gradle
index 2b41fd98da24..1034f1adfec9 100644
--- a/samples/client/others/java/jersey2-oneOf-duplicates/build.gradle
+++ b/samples/client/others/java/jersey2-oneOf-duplicates/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle b/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
index e7a6b673223a..6d4ef56d7095 100644
--- a/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
+++ b/samples/client/others/java/okhttp-gson-oneOf-array/build.gradle
@@ -107,7 +107,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/others/java/okhttp-gson-oneOf/build.gradle b/samples/client/others/java/okhttp-gson-oneOf/build.gradle
index d96f6d99d885..062e27615f0a 100644
--- a/samples/client/others/java/okhttp-gson-oneOf/build.gradle
+++ b/samples/client/others/java/okhttp-gson-oneOf/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/others/java/okhttp-gson-streaming/build.gradle b/samples/client/others/java/okhttp-gson-streaming/build.gradle
index 41bc90123d83..10eaf0445d5d 100644
--- a/samples/client/others/java/okhttp-gson-streaming/build.gradle
+++ b/samples/client/others/java/okhttp-gson-streaming/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
index b940117be525..609096793f54 100644
--- a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
+++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle
@@ -102,7 +102,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle b/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle
index 457d15bc4032..510570ca8d71 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -109,7 +108,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle
index ea38c707184d..eeb3f1b1ab1a 100644
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -109,7 +108,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/build.gradle b/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/build.gradle
index 177c423b3fb8..f0bf323b034c 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.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 3481d0b7c6fc..d161acde0d47 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-3.1/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
index 96bee6a6a581..03675af26a4f 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
index ff5a6701b9e7..6660f2b4b3a6 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.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 07ac6648265f..f0672fb85477 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.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 add44e0ec5fc..e2d16b6bdaf0 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
index aa345bbc8a92..f5ad8ffd631b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
index bfee284c1c6f..e7bb6485f6cf 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle
@@ -102,11 +102,12 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
+    swagger_annotations_version = "1.6.9"
     jakarta_annotation_version = "1.3.5"
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
+    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index bfee284c1c6f..3136dfcbcaea 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -106,7 +106,6 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
diff --git a/samples/client/petstore/java/resttemplate-jakarta/build.gradle b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
index f72bd78eabf4..f74509828b82 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/build.gradle
+++ b/samples/client/petstore/java/resttemplate-jakarta/build.gradle
@@ -100,9 +100,9 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.20"
+    spring_web_version = "6.2.8"
     jakarta_annotation_version = "2.1.1"
-    beanvalidation_version = "3.0.2"
+    bean_validation_version = "3.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
index 903eb4f522f6..fba8fac0cbe2 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger1/build.gradle
@@ -103,7 +103,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/petstore/java/resttemplate-swagger2/build.gradle b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
index bf41a5be2312..3a26c126ac24 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/build.gradle
+++ b/samples/client/petstore/java/resttemplate-swagger2/build.gradle
@@ -103,7 +103,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index 9e76d3dde589..eca320545410 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -102,7 +102,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index 7925740c3112..80e33d5e76e2 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -102,7 +102,7 @@ ext {
     jackson_databind_nullable_version = "0.2.6"
     spring_web_version = "5.3.33"
     jakarta_annotation_version = "1.3.5"
-    beanvalidation_version = "2.0.2"
+    bean_validation_version = "2.0.2"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
 }
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle
index e1ac6a79f5f9..d340af089b21 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle
index a6244858a866..828c05e065cc 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/build.gradle
index b3bfa1c7fbbf..57068ca9b5fd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/build.gradle
@@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
+    swagger_annotations_version = "1.6.6"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
index da665aa10774..1a33e66b6967 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.5"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
@@ -111,7 +110,6 @@ ext {
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"