diff --git a/docs/customization.md b/docs/customization.md index bfecdecbd97..ededd1d7fe3 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -248,7 +248,7 @@ CONFIG OPTIONS retrofit - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0) retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2) google-api-client - HTTP client: google-api-client 1.23.0. JSON processing: Jackson 2.8.9 - rest-assured - HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8 + rest-assured - HTTP client: rest-assured : 3.3.0. JSON processing: Gson 2.8.5. Only for Java8 ``` Your config file for Java can look like 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 af9e49e0dfb..03ea659d066 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 @@ -96,15 +96,15 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.21" - rest_assured_version = "3.1.0" + rest_assured_version = "3.3.0" junit_version = "4.12" - gson_version = "2.6.1" - gson_fire_version = "1.8.2" + gson_version = "2.8.5" + gson_fire_version = "1.8.3" {{#joda}} jodatime_version = "2.9.9" {{/joda}} {{#threetenbp}} - threetenbp_version = "1.3.5" + threetenbp_version = "1.3.8" {{/threetenbp}} okio_version = "1.13.0" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index 7a666ebace6..454ff06c346 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -10,14 +10,14 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.5.21", - "io.rest-assured" % "scala-support" % "3.1.0", - "com.google.code.gson" % "gson" % "2.6.1", - "io.gsonfire" % "gson-fire" % "1.8.2" % "compile", + "io.rest-assured" % "scala-support" % "3.3.0", + "com.google.code.gson" % "gson" % "2.8.5", + "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", {{#joda}} "joda-time" % "joda-time" % "2.9.9" % "compile", {{/joda}} {{#threetenbp}} - "org.threeten" % "threetenbp" % "1.3.5" % "compile", + "org.threeten" % "threetenbp" % "1.3.8" % "compile", {{/threetenbp}} "com.squareup.okio" % "okio" % "1.13.0" % "compile", "junit" % "junit" % "4.12" % "test", 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 64285da8111..d480939b403 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 @@ -251,15 +251,15 @@ UTF-8 1.5.21 - 3.1.0 - 2.6.1 - 1.8.2 + 3.3.0 + 2.8.5 + 1.8.3 1.0.0 {{#joda}} 2.9.9 {{/joda}} {{#threetenbp}} - 1.3.5 + 1.3.8 {{/threetenbp}} 1.13.0 4.12 diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index a751e7e922d..0e5596f30af 100644 --- a/samples/client/petstore/java/rest-assured/build.gradle +++ b/samples/client/petstore/java/rest-assured/build.gradle @@ -96,11 +96,11 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.21" - rest_assured_version = "3.1.0" + rest_assured_version = "3.3.0" junit_version = "4.12" - gson_version = "2.6.1" - gson_fire_version = "1.8.2" - threetenbp_version = "1.3.5" + gson_version = "2.8.5" + gson_fire_version = "1.8.3" + threetenbp_version = "1.3.8" okio_version = "1.13.0" } diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt index eb61e74a894..5a011f9f84d 100644 --- a/samples/client/petstore/java/rest-assured/build.sbt +++ b/samples/client/petstore/java/rest-assured/build.sbt @@ -10,10 +10,10 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.5.21", - "io.rest-assured" % "scala-support" % "3.1.0", - "com.google.code.gson" % "gson" % "2.6.1", - "io.gsonfire" % "gson-fire" % "1.8.2" % "compile", - "org.threeten" % "threetenbp" % "1.3.5" % "compile", + "io.rest-assured" % "scala-support" % "3.3.0", + "com.google.code.gson" % "gson" % "2.8.5", + "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", + "org.threeten" % "threetenbp" % "1.3.8" % "compile", "com.squareup.okio" % "okio" % "1.13.0" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml index 030473c7781..95886cb3275 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -235,11 +235,11 @@ UTF-8 1.5.21 - 3.1.0 - 2.6.1 - 1.8.2 + 3.3.0 + 2.8.5 + 1.8.3 1.0.0 - 1.3.5 + 1.3.8 1.13.0 4.12