From e02e8759782e5624f1008053ab676ebbd7239fb6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 19 Jul 2018 17:57:21 +0800 Subject: [PATCH] Update gradle dependency for Java RESTEasy API client (#597) * update resteasy gradle dependency * remove java8 option when testing resteasy (java) --- .../libraries/resteasy/build.gradle.mustache | 7 ++++--- .../Java/libraries/resteasy/build.sbt.mustache | 18 +++++++++++------- .../client/petstore/java/resteasy/build.gradle | 7 ++++--- .../client/petstore/java/resteasy/build.sbt | 12 ++++++++---- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index fc2cd18dbea..ac2cb6fab8e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -117,8 +117,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.6.4" + swagger_annotations_version = "1.5.18" + jackson_version = "2.8.6" + threetenbp_version = "2.6.4" jersey_version = "2.22.2" resteasy_version = "3.1.3.Final" {{^java8}} @@ -142,7 +143,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version" + compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" {{#java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index 348d29d96d1..cdfc4f848fd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -9,17 +9,21 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", + "io.swagger" % "swagger-annotations" % "1.5.18", "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", + "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final", + "org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final", + "org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.6", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.6", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.6", + "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4", {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5", - {{/java8}} - {{^java8}} + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.6", + {{/java8}} + {{^java8}} "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", "joda-time" % "joda-time" % "2.9.4", "com.brsanthu" % "migbase64" % "2.2", diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index d2f9ff5b15b..86e77bee641 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -93,8 +93,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.6.4" + swagger_annotations_version = "1.5.18" + jackson_version = "2.8.6" + threetenbp_version = "2.6.4" jersey_version = "2.22.2" resteasy_version = "3.1.3.Final" jodatime_version = "2.9.4" @@ -112,7 +113,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version" + compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" compile "com.brsanthu:migbase64:2.2" diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index fb8f636d356..166b7b91f8a 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -9,13 +9,17 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", + "io.swagger" % "swagger-annotations" % "1.5.18", "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", + "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final", + "org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final", + "org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.6", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.6", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.6", + "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", "joda-time" % "joda-time" % "2.9.4", "com.brsanthu" % "migbase64" % "2.2",