diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index cb6d74e29718..f81e4632b648 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/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 index 756579591bba..4d96d46027cf 100644 --- 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}} 2.2.15 {{/swagger2AnnotationLibrary}} - 4.5.1 + 5.3.2 2.10.1 1.9.0 {{#joda}} @@ -365,7 +365,7 @@ {{#useBeanValidation}} 2.0.2 {{/useBeanValidation}} - 1.17.5 + 3.6.0 4.13.2 diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index e20b0dc87079..b112fc390a84 100644 --- 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 index bf2cd0d5ea9d..0a0c91d0e4d3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -277,7 +277,7 @@ UTF-8 - 4.5.1 + 5.3.2 2.10.1 1.9.0 2.15.2 @@ -285,7 +285,7 @@ 0.2.6 1.3.5 2.0.2 - 1.17.5 + 3.6.0 4.13.2 diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index b5a7545becdf..d0fc73dd3431 100644 --- 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 index f26730a413f0..4ba82ad7c648 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -254,12 +254,12 @@ UTF-8 - 4.5.1 + 5.3.2 2.10.1 1.9.0 1.3.5 2.0.2 - 1.17.5 + 3.6.0 4.13.2