Merge branch 'master' into master

tx-group-adm · Jul 19, 2019 · 25a6696 · 25a6696
2 parents 0081482 + 2b134ac
commit 25a6696
Show file tree

Hide file tree

Showing 186 changed files with 2,810 additions and 3,971 deletions.
diff --git a/bin/spring-all-pestore.sh b/bin/spring-all-pestore.sh
@@ -5,8 +5,9 @@
 ./bin/spring-delegate-j8.sh
 ./bin/spring-stubs.sh
 ./bin/spring-mvc-petstore-j8-async-server.sh
-./bin/springboot-petstore-server.sh
+./bin/spring-mvc-petstore-j8-localdatetime.sh
 ./bin/spring-mvc-petstore-server.sh
+./bin/springboot-petstore-server.sh
 ./bin/springboot-petstore-server-beanvalidation.sh
 ./bin/springboot-petstore-server-implicitHeaders.sh
 ./bin/springboot-petstore-server-useOptional.sh
diff --git a/bin/typescript-angular-v5-petstore-with-npm.1.sh b/bin/typescript-angular-v5-petstore-with-npm.1.sh
diff --git a/bin/typescript-angular-v6-petstore-with-npm.sh b/bin/typescript-angular-v6-petstore-with-npm.sh
diff --git a/modules/swagger-codegen-maven-plugin/examples/java-client.xml b/modules/swagger-codegen-maven-plugin/examples/java-client.xml
@@ -120,7 +120,7 @@
     <properties>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>2.25.1</jersey-version>
-        <jackson-version>2.9.5</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
         <jodatime-version>2.7</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -74,16 +74,16 @@ public JavaClientCodegen() {
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
         cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
 
-        supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
+        supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.9");
+        supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.9");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
         supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
-        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.9.9");
+        supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.9.9");
+        supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.9.9");
+        supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.9.9");
         supportedLibraries.put("rest-assured", "HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8");
 
         CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");

diff --git a/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -175,6 +175,8 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
         // Libraries generated with v2.x of ng-packagr will ship with AoT metadata in v4, which is intended for Angular v5 (and Angular v6).
         additionalProperties.put("useOldNgPackagr", !ngVersion.atLeast("5.0.0"));
 
+        additionalProperties.put("supportedNgVersion", ngVersion.atLeast("6.0.0"));
+
         //Files for building our lib
         supportingFiles.add(new SupportingFile("package.mustache", getIndexDirectory(), "package.json"));
         supportingFiles.add(new SupportingFile("typings.mustache", getIndexDirectory(), "typings.json"));

diff --git a/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache
@@ -24,7 +24,7 @@ repositories {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.7.0"
+    jackson_version = "2.9.9"
 }
 
 dependencies {

diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
@@ -121,7 +121,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
+    jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
     jersey_version = "1.19.4"
     jodatime_version = "2.9.9"
     junit_version = "4.12"

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -101,7 +101,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.9"
-    jackson_version = "2.8.7"
+    jackson_version = "2.9.9"
     {{#threetenbp}}
     threepane_version = "2.6.4"
     {{/threetenbp}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
       "io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
       "io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
       "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.8.7" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "junit" % "junit" % "4.12" % "test",

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@@ -297,7 +297,7 @@
         <swagger-core-version>1.5.18</swagger-core-version>
         <feign-version>9.4.0</feign-version>
         <feign-form-version>2.1.0</feign-form-version>
-        <jackson-version>2.8.9</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
         {{#threetenbp}}
             <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         {{/threetenbp}}

diff --git a/...swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/...swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
@@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.9"
     google_api_client_version = "1.23.0"
     jersey_common_version = "2.25.1"
     jodatime_version = "2.9.9"

diff --git a/...es/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/...es/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
@@ -12,17 +12,17 @@ lazy val root = (project in file(".")).
       "io.swagger" % "swagger-annotations" % "1.5.17",
       "com.google.api-client" % "google-api-client" % "1.23.0",
       "org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
       {{#withXml}}
-      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.9" % "compile",
       {{/withXml}}
       {{#joda}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
       {{/joda}}
       {{#java8}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
       {{/java8}}
       {{#threetenbp}}
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -286,7 +286,7 @@
         <swagger-annotations-version>1.5.17</swagger-annotations-version>
         <google-api-client-version>1.23.0</google-api-client-version>
         <jersey-common-version>2.25.1</jersey-common-version>
-        <jackson-version>2.8.9</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
         {{#joda}}
             <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.9"
     {{#supportJava6}}
     jersey_version = "2.6"
     commons_io_version=2.5

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
@@ -13,14 +13,14 @@ lazy val root = (project in file(".")).
       "org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
       "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
-      "com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
       {{#joda}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
       {{/joda}}
       {{#java8}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
       {{/java8}}
       {{#threetenbp}}
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -323,7 +323,7 @@
             <commons_io_version>2.5</commons_io_version>
             <commons_lang3_version>3.6</commons_lang3_version>
         {{/supportJava6}}
-        <jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
+        <jackson-version>{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -106,7 +106,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.6.4"
+    jackson_version = "2.9.9"
+    threetenbp_version = "2.6.4"
     jersey_version = "2.22.2"
     resteasy_version = "3.1.3.Final"
     {{^java8}}
@@ -130,7 +131,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/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
@@ -13,14 +13,14 @@ lazy val root = (project in file(".")).
       "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",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9",
       {{#java8}}
-	  "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5",
+	  "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9",
 	  {{/java8}}
 	  {{^java8}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9",
       "joda-time" % "joda-time" % "2.9.4",
       "com.brsanthu" % "migbase64" % "2.2",
       {{/java8}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -235,7 +235,7 @@
         <dependency>
             <groupId>com.github.joschi.jackson</groupId>
             <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>${jackson-version}</version>
+            <version>${threetenbp-version}</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -249,7 +249,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.18</swagger-core-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
+        <threetenbp-version>2.6.4</threetenbp-version>
         {{^java8}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/java8}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.9"
     spring_web_version = "4.3.9.RELEASE"
     jodatime_version = "2.9.9"
     junit_version = "4.12"

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -288,7 +288,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.17</swagger-annotations-version>
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
-        <jackson-version>2.8.9</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -104,11 +104,11 @@ ext {
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
     {{#play24}}
-    jackson_version = "2.6.6"
+    jackson_version = "2.9.9"
     play_version = "2.4.11"
     {{/play24}}
     {{#play25}}
-    jackson_version = "2.7.8"
+    jackson_version = "2.9.9"
     play_version = "2.5.14"
     {{/play25}}
     {{/usePlayWS}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -17,15 +17,15 @@ lazy val root = (project in file(".")).
       {{#usePlayWS}}
       {{#play24}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
       {{/play24}}
       {{#play25}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.8" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
       {{/play25}}
       "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       {{/usePlayWS}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -334,11 +334,11 @@
         <swagger-core-version>1.5.18</swagger-core-version>
         {{#usePlayWS}}
             {{#play24}}
-                <jackson-version>2.6.6</jackson-version>
+                <jackson-version>2.9.9</jackson-version>
                 <play-version>2.4.11</play-version>
             {{/play24}}
             {{#play25}}
-                <jackson-version>2.7.8</jackson-version>
+                <jackson-version>2.9.9</jackson-version>
                 <play-version>2.5.15</play-version>
             {{/play25}}
         {{/usePlayWS}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/build.gradle.mustache
@@ -27,7 +27,8 @@ task execute(type:JavaExec) {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
+    {{#threetenbp}}threetenbp_version = "2.6.4"{{/threetenbp}}
+    jackson_version = "2.9.9"
     vertx_version = "3.4.2"
     junit_version = "4.12"
 }
@@ -46,7 +47,7 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     {{/java8}}
     {{#threetenbp}}
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     {{/threetenbp}}
     testCompile "junit:junit:$junit_version"
     testCompile "io.vertx:vertx-unit:$vertx_version"

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -250,7 +250,7 @@
             <dependency>
                 <groupId>com.github.joschi.jackson</groupId>
                 <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-version}</version>
+                <version>${threetenbp-version}</version>
             </dependency>
         {{/threetenbp}}
 
@@ -273,7 +273,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx-version>3.4.2</vertx-version>
         <swagger-core-version>1.5.18</swagger-core-version>
-        <jackson-version>{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
+        {{#threetenbp}}<threetenbp-version>2.6.4</threetenbp-version>{{/threetenbp}}
+        <jackson-version>2.9.9</jackson-version>
         <junit-version>4.12</junit-version>
     </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -329,7 +329,7 @@
         <commons_io_version>2.5</commons_io_version>
         <commons_lang3_version>3.6</commons_lang3_version>
         {{/supportJava6}}
-        <jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
+        <jackson-version>{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>[2.8.3,3)</version>
+            <version>2.9.9</version>
         </dependency>
 
         <!-- Swagger annotations -->