update rest-assured dep to newer versions (#17107)

OpenAPITools · Nov 17, 2023 · 195f27d · 195f27d
1 parent 07620ce
commit 195f27d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/...es/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/...es/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -97,8 +97,13 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
+    {{#swagger1AnnotationLibrary}}
     swagger_annotations_version = "1.6.6"
-    rest_assured_version = "4.5.1"
+    {{/swagger1AnnotationLibrary}}
+    {{#swagger2AnnotationLibrary}}
+    swagger_annotations_version = "2.2.15"
+    {{/swagger2AnnotationLibrary}}
+    rest_assured_version = "5.3.2"
     junit_version = "4.13.2"
 {{#jackson}}
     jackson_version = "2.13.4"
@@ -109,17 +114,22 @@ ext {
     jakarta_annotation_version = "1.3.5"
 {{/jackson}}
 {{#gson}}
-    gson_version = "2.8.9"
+    gson_version = "2.10.1"
     gson_fire_version = "1.9.0"
 {{/gson}}
 {{#joda}}
     jodatime_version = "2.10.5"
 {{/joda}}
-    okio_version = "1.17.5"
+    okio_version = "3.6.0"
 }
 
 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 "io.rest-assured:rest-assured:$rest_assured_version"
 {{#jackson}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -345,7 +345,7 @@
         {{#swagger2AnnotationLibrary}}
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <rest-assured.version>4.5.1</rest-assured.version>
+        <rest-assured.version>5.3.2</rest-assured.version>
         <gson-version>2.10.1</gson-version>
         <gson-fire-version>1.9.0</gson-fire-version>
         {{#joda}}
@@ -365,7 +365,7 @@
 {{#useBeanValidation}}
         <beanvalidation-version>2.0.2</beanvalidation-version>
 {{/useBeanValidation}}
-        <okio-version>1.17.5</okio-version>
+        <okio-version>3.6.0</okio-version>
         <junit-version>4.13.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle
@@ -97,18 +97,16 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.6"
-    rest_assured_version = "4.5.1"
+    rest_assured_version = "5.3.2"
     junit_version = "4.13.2"
     jackson_version = "2.13.4"
     jackson_databind_version = "2.13.4.2"
     jackson_databind_nullable_version = "0.2.6"
     jakarta_annotation_version = "1.3.5"
-    okio_version = "1.17.5"
+    okio_version = "3.6.0"
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "io.rest-assured:rest-assured:$rest_assured_version"
     implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"

diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml
@@ -277,15 +277,15 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <rest-assured.version>4.5.1</rest-assured.version>
+        <rest-assured.version>5.3.2</rest-assured.version>
         <gson-version>2.10.1</gson-version>
         <gson-fire-version>1.9.0</gson-fire-version>
         <jackson-version>2.15.2</jackson-version>
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
-        <okio-version>1.17.5</okio-version>
+        <okio-version>3.6.0</okio-version>
         <junit-version>4.13.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle
@@ -97,16 +97,14 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.6.6"
-    rest_assured_version = "4.5.1"
+    rest_assured_version = "5.3.2"
     junit_version = "4.13.2"
-    gson_version = "2.8.9"
+    gson_version = "2.10.1"
     gson_fire_version = "1.9.0"
-    okio_version = "1.17.5"
+    okio_version = "3.6.0"
 }
 
 dependencies {
-    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "io.rest-assured:rest-assured:$rest_assured_version"
     implementation "io.gsonfire:gson-fire:$gson_fire_version"

diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml
@@ -254,12 +254,12 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <rest-assured.version>4.5.1</rest-assured.version>
+        <rest-assured.version>5.3.2</rest-assured.version>
         <gson-version>2.10.1</gson-version>
         <gson-fire-version>1.9.0</gson-fire-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
-        <okio-version>1.17.5</okio-version>
+        <okio-version>3.6.0</okio-version>
         <junit-version>4.13.2</junit-version>
     </properties>
 </project>