fix samples

steven-blakowski · steven-blakowski · commit 8fd33f8a74bf · 2025-06-18T12:39:43.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`task sourcesJar(type: Jar, dependsOn: classes) {`
`100`		`- classifier = 'sources'`
	`100`	`+ archiveClassifier = 'sources'`
`101`	`101`	`from sourceSets.main.allSource`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`105`		`- classifier = 'javadoc'`
	`105`	`+ archiveClassifier = 'javadoc'`
`106`	`106`	`from javadoc.destinationDir`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ ext {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`dependencies {`
`109`		`- implementation 'io.swagger:swagger-annotations:1.6.8'`
`110`	`109`	`implementation "com.google.code.findbugs:jsr305:3.0.2"`
`111`	`110`	`implementation 'com.squareup.okhttp3:okhttp:4.12.0'`
`112`	`111`	`implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ ext {`
`102`	`102`	`jackson_databind_nullable_version = "0.2.6"`
`103`	`103`	`spring_web_version = "5.3.33"`
`104`	`104`	`jakarta_annotation_version = "1.3.5"`
`105`		`- beanvalidation_version = "2.0.2"`
	`105`	`+ bean_validation_version = "2.0.2"`
`106`	`106`	`jodatime_version = "2.9.9"`
`107`	`107`	`junit_version = "5.10.2"`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`ext {`
`101`		`- swagger_annotations_version = "1.6.5"`
`102`	`101`	`jackson_version = "2.17.1"`
`103`	`102`	`jackson_databind_version = "2.17.1"`
`104`	`103`	`jackson_databind_nullable_version = "0.2.6"`
`@@ -108,7 +107,6 @@ ext {`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`dependencies {`
`111`		`- implementation "io.swagger:swagger-annotations:$swagger_annotations_version"`
`112`	`110`	`implementation "com.google.code.findbugs:jsr305:3.0.2"`
`113`	`111`	`implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"`
`114`	`112`	`implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ ext {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`dependencies {`
`110`		`- implementation 'io.swagger:swagger-annotations:1.6.8'`
`111`	`110`	`implementation "com.google.code.findbugs:jsr305:3.0.2"`
`112`	`111`	`implementation 'com.squareup.okhttp3:okhttp:4.12.0'`
`113`	`112`	`implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'`