From ff1c7c87ef3635a27a87689d59a0704b181a73f3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 27 May 2019 00:26:24 +0800 Subject: [PATCH] update jackson joda version, samples (#3005) --- .gitignore | 3 +++ .../main/resources/Java/libraries/resteasy/build.sbt.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/cxf-ext/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/cxf/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 4 ++-- .../main/resources/JavaJaxRS/libraries/jersey1/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/resteasy/gradle.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/resteasy/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/spec/pom.mustache | 2 +- .../resources/JavaSpring/libraries/spring-mvc/pom.mustache | 2 +- .../src/main/resources/scala-httpclient/build.sbt.mustache | 4 ++-- .../src/main/resources/scala-httpclient/pom.mustache | 2 +- samples/client/petstore/java/resteasy/build.sbt | 2 +- .../petstore/scala-httpclient/.openapi-generator/VERSION | 2 +- samples/client/petstore/scala-httpclient/build.sbt | 4 ++-- samples/client/petstore/scala-httpclient/pom.xml | 2 +- .../src/main/scala/org/openapitools/client/ApiInvoker.scala | 2 +- .../src/main/scala/org/openapitools/client/api/PetApi.scala | 2 +- .../src/main/scala/org/openapitools/client/api/StoreApi.scala | 2 +- .../src/main/scala/org/openapitools/client/api/UserApi.scala | 2 +- .../scala/org/openapitools/client/model/ApiResponse.scala | 2 +- .../main/scala/org/openapitools/client/model/Category.scala | 2 +- .../src/main/scala/org/openapitools/client/model/Order.scala | 2 +- .../src/main/scala/org/openapitools/client/model/Pet.scala | 2 +- .../src/main/scala/org/openapitools/client/model/Tag.scala | 2 +- .../src/main/scala/org/openapitools/client/model/User.scala | 2 +- samples/server/petstore/jaxrs-cxf/pom.xml | 4 ++-- samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle | 2 +- samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle | 2 +- samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/eap/build.gradle | 2 +- samples/server/petstore/jaxrs-resteasy/eap/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey1-useTags/pom.xml | 4 ++-- samples/server/petstore/jaxrs/jersey1/pom.xml | 4 ++-- samples/server/petstore/jaxrs/jersey2-useTags/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey2/pom.xml | 2 +- samples/server/petstore/spring-mvc-j8-async/pom.xml | 2 +- samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml | 2 +- samples/server/petstore/spring-mvc/pom.xml | 2 +- 44 files changed, 59 insertions(+), 56 deletions(-) diff --git a/.gitignore b/.gitignore index 942cbf75688..bae2673fd1c 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,9 @@ samples/client/petstore/java/jersey2/build/ samples/client/petstore/java/okhttp-gson/.gradle/ samples/client/petstore/java/okhttp-gson/build/ samples/client/petstore/java/feign/build/ +samples/client/petstore/java/feign10x/build/ +samples/client/petstore/java/feign/project/ +samples/client/petstore/java/feign10x/project/ samples/client/petstore/java/retrofit/build/ samples/client/petstore/java/retrofit2/build/ samples/client/petstore/java/retrofit2/hello.txt 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 81170d4c520..4f67eb38823 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 @@ -18,10 +18,10 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.6" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", {{/java8}} {{^java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache index 40de23abd33..315e0d096a2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache @@ -204,7 +204,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 @@ -213,7 +213,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache index 6d16df1fd37..83c73351727 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache @@ -341,7 +341,7 @@ 1.1.7 {{/generateSpringBootApplication}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache index 805267eef7c..62d0e3ebc06 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -207,7 +207,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index a9796d01704..2e75578f597 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -249,7 +249,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 @@ -264,7 +264,7 @@ 1.5.9.RELEASE {{/generateSpringBootApplication}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 53accf2802a..08e49b7f3c4 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -200,13 +200,13 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 {{#useBeanValidation}} 1.1.0.Final {{/useBeanValidation}} 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 91a926cac2a..9785f8ac100 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache @@ -212,7 +212,7 @@ {{/useBeanValidation}} 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 {{#supportJava6}} 2.5 3.5 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index 60f4d69117b..df8a82b4610 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache @@ -19,11 +19,11 @@ dependencies { providedCompile 'javax.validation:validation-api:1.1.0.Final' {{/useBeanValidation}} {{^java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' {{/java8}} {{#java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9' {{/java8}} testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index 11c25090ada..48d331f4aee 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -156,14 +156,14 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 {{/java8}} {{#java8}} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.6.3 + 2.9.9 {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index 65d748762c2..84e2d612aa7 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -15,12 +15,12 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' - compile 'io.swagger:swagger-annotations:1.5.10' + compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' {{#useBeanValidation}} providedCompile 'javax.validation:validation-api:1.1.0.Final' {{/useBeanValidation}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature compile 'io.swagger:swagger-jaxrs:1.5.12' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache index d8e8fb2c63a..d0000c1cd57 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -123,7 +123,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.4.1 + 2.9.9 joda-time @@ -182,7 +182,7 @@ - 1.5.18 + 1.5.22 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache index 5d2110b5f6e..40d6eba4c63 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache @@ -125,7 +125,7 @@ {{/useBeanValidation}} - 2.8.9 + 2.9.9 4.8.1 diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 81a6a95b9ca..aafc216dba0 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -245,7 +245,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 {{#useBeanValidation}} 1.1.0.Final diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache index 6ecd89c0ea7..328c251865f 100644 --- a/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache @@ -4,8 +4,8 @@ organization := "{{groupId}}" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.2", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9", "com.sun.jersey" % "jersey-core" % "1.19.4", "com.sun.jersey" % "jersey-client" % "1.19.4", "com.sun.jersey.contribs" % "jersey-multipart" % "1.19.4", diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache index 495ff623d35..3f0d26bc5ea 100644 --- a/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache @@ -242,7 +242,7 @@ 1.5.18 1.0.5 1.0.0 - 2.9.2 + 2.9.9 4.12 3.1.5 diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index a2bcc358b73..9b2cf7539f3 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -17,7 +17,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", "junit" % "junit" % "4.12" % "test", diff --git a/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION index 94ae9ee1fa8..06b5019af3f 100644 --- a/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient/build.sbt b/samples/client/petstore/scala-httpclient/build.sbt index 95c39ce8569..990c87596d5 100644 --- a/samples/client/petstore/scala-httpclient/build.sbt +++ b/samples/client/petstore/scala-httpclient/build.sbt @@ -4,8 +4,8 @@ organization := "org.openapitools" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.2", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9", "com.sun.jersey" % "jersey-core" % "1.19.4", "com.sun.jersey" % "jersey-client" % "1.19.4", "com.sun.jersey.contribs" % "jersey-multipart" % "1.19.4", diff --git a/samples/client/petstore/scala-httpclient/pom.xml b/samples/client/petstore/scala-httpclient/pom.xml index 995f7c78e18..d7b73e5d3f4 100644 --- a/samples/client/petstore/scala-httpclient/pom.xml +++ b/samples/client/petstore/scala-httpclient/pom.xml @@ -242,7 +242,7 @@ 1.5.18 1.0.5 1.0.0 - 2.9.2 + 2.9.9 4.12 3.1.5 diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala index 885c71199db..0b17519c6f9 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala index 25b5fff03a6..768cb5c0b5f 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala index 9eeaea664df..4328080db93 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala index 048a7d10d6a..efd7f1ef97f 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala index 090cbaddd4b..be741231329 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala index 5040e0cb96f..be3307b8f8e 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala index 72f09d7a74e..d0ca63b5091 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala index 1f060b10c7f..2de76ae3588 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala index da3cd4acd44..6fbabf7ed63 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala index cd4c1c9b670..fc24b101e8b 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 0548375aeee..273e216da18 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -191,14 +191,14 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 2.5 1.1.0.Final 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle index db258e31787..63a1d0b7c7e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml index efcd7e66203..19994877161 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -148,7 +148,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index 3d50424ed37..6dd309498e1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 78a42e812dc..8e47b072dc2 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -153,7 +153,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index 3d50424ed37..6dd309498e1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index f468d7d0321..11a3ceddfc0 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -153,7 +153,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml index bd29eaa7083..a85ec855780 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml @@ -196,11 +196,11 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 1.1.0.Final 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index ab850e9645e..fad09cbc146 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -196,11 +196,11 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 1.1.0.Final 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index 9c94168346c..c396d5a6db3 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -184,7 +184,7 @@ 1.1.0.Final 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 4.12 1.1.7 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index dbc9b8247e4..05175f71f71 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -184,7 +184,7 @@ 1.1.0.Final 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 4.12 1.1.7 2.5 diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index c38516914ad..7c74b1f294a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml index 2386244d28b..92fd248964d 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index 7416f0c0237..adcf1f57683 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE