From a50f14ae1d11f3d12118b28ae3ccde6c584caa03 Mon Sep 17 00:00:00 2001 From: frantuma Date: Wed, 3 Mar 2021 11:50:37 +0100 Subject: [PATCH] ref CVE-2020-25649 - jackson 2.11.4 --- .../examples/java-client.xml | 14 ++++++------ .../codegen/languages/JavaClientCodegen.java | 14 ++++++------ .../resources/Groovy/build.gradle.mustache | 2 +- .../main/resources/Java/build.gradle.mustache | 4 ++-- .../libraries/feign/build.gradle.mustache | 2 +- .../Java/libraries/feign/build.sbt.mustache | 8 +++---- .../Java/libraries/feign/pom.mustache | 2 +- .../google-api-client/build.gradle.mustache | 14 ++++++------ .../google-api-client/build.sbt.mustache | 12 +++++----- .../libraries/google-api-client/pom.mustache | 2 +- .../libraries/jersey2/build.gradle.mustache | 2 +- .../Java/libraries/jersey2/build.sbt.mustache | 10 ++++----- .../Java/libraries/jersey2/pom.mustache | 2 +- .../Java/libraries/okhttp-gson/pom.mustache | 2 +- .../libraries/resteasy/build.gradle.mustache | 2 +- .../libraries/resteasy/build.sbt.mustache | 10 ++++----- .../Java/libraries/resteasy/pom.mustache | 2 +- .../resttemplate/build.gradle.mustache | 14 ++++++------ .../Java/libraries/resttemplate/pom.mustache | 2 +- .../libraries/retrofit2/build.gradle.mustache | 4 ++-- .../libraries/retrofit2/build.sbt.mustache | 12 +++++----- .../Java/libraries/retrofit2/pom.mustache | 4 ++-- .../libraries/vertx/build.gradle.mustache | 2 +- .../Java/libraries/vertx/pom.mustache | 2 +- .../src/main/resources/Java/pom.mustache | 2 +- .../resources/JavaJaxRS/cxf-cdi/pom.mustache | 4 ++-- .../main/resources/JavaJaxRS/cxf/pom.mustache | 12 +++++----- .../JavaJaxRS/cxf/server/pom.mustache | 22 +++++++++---------- .../JavaJaxRS/libraries/jersey1/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/pom.mustache | 6 ++--- .../JavaJaxRS/resteasy/eap/gradle.mustache | 4 ++-- .../JavaJaxRS/resteasy/eap/pom.mustache | 10 ++++----- .../JavaJaxRS/resteasy/gradle.mustache | 4 ++-- .../resources/JavaJaxRS/resteasy/pom.mustache | 6 ++--- .../libraries/spring-boot/pom.mustache | 8 +++---- .../libraries/spring-cloud/pom.mustache | 8 +++---- .../libraries/spring-mvc/pom.mustache | 2 +- .../resources/JavaVertXServer/pom.mustache | 12 +++++----- .../src/main/resources/MSF4J/pom.mustache | 6 ++--- .../src/main/resources/undertow/pom.mustache | 2 +- pom.xml | 2 +- pom.xml.bash | 4 ++-- pom.xml.circleci | 4 ++-- pom.xml.circleci.java7 | 4 ++-- pom.xml.ios | 4 ++-- pom.xml.jenkins | 4 ++-- pom.xml.jenkins.java7 | 4 ++-- pom.xml.travis | 4 ++-- samples/client/petstore/groovy/build.gradle | 2 +- .../client/petstore/java/feign/build.gradle | 2 +- samples/client/petstore/java/feign/build.sbt | 8 +++---- samples/client/petstore/java/feign/pom.xml | 2 +- .../java/google-api-client/build.gradle | 14 ++++++------ .../petstore/java/google-api-client/build.sbt | 6 ++--- .../petstore/java/google-api-client/pom.xml | 2 +- .../petstore/java/jersey2-java8/build.gradle | 2 +- .../petstore/java/jersey2-java8/build.sbt | 8 +++---- .../petstore/java/jersey2-java8/pom.xml | 2 +- .../client/petstore/java/jersey2/build.gradle | 2 +- .../petstore/java/resteasy/build.gradle | 2 +- .../client/petstore/java/resteasy/build.sbt | 8 +++---- samples/client/petstore/java/resteasy/pom.xml | 2 +- .../java/resttemplate-withXml/build.gradle | 14 ++++++------ .../java/resttemplate-withXml/pom.xml | 2 +- .../petstore/java/resttemplate/build.gradle | 14 ++++++------ .../client/petstore/java/resttemplate/pom.xml | 2 +- .../java/retrofit2-play24/build.gradle | 2 +- .../petstore/java/retrofit2-play24/build.sbt | 6 ++--- .../petstore/java/retrofit2-play24/pom.xml | 2 +- .../java/retrofit2-play25/build.gradle | 2 +- .../petstore/java/retrofit2-play25/build.sbt | 6 ++--- .../petstore/java/retrofit2-play25/pom.xml | 2 +- .../client/petstore/java/vertx/build.gradle | 2 +- samples/client/petstore/java/vertx/pom.xml | 2 +- .../client/petstore/jaxrs-cxf-client/pom.xml | 4 ++-- samples/server/petstore/java-msf4j/pom.xml | 6 ++--- .../server/petstore/java-vertx/async/pom.xml | 4 ++-- samples/server/petstore/java-vertx/rx/pom.xml | 4 ++-- .../jaxrs-cxf-annotated-base-path/pom.xml | 6 ++--- samples/server/petstore/jaxrs-cxf-cdi/pom.xml | 2 +- .../petstore/jaxrs-cxf-non-spring-app/pom.xml | 6 ++--- samples/server/petstore/jaxrs-cxf/pom.xml | 6 ++--- .../jaxrs-resteasy/default/build.gradle | 2 +- .../petstore/jaxrs-resteasy/default/pom.xml | 4 ++-- .../jaxrs-resteasy/eap-java8/build.gradle | 2 +- .../petstore/jaxrs-resteasy/eap-java8/pom.xml | 8 +++---- .../jaxrs-resteasy/eap-joda/build.gradle | 2 +- .../petstore/jaxrs-resteasy/eap-joda/pom.xml | 8 +++---- .../petstore/jaxrs-resteasy/eap/build.gradle | 2 +- .../petstore/jaxrs-resteasy/eap/pom.xml | 8 +++---- .../jaxrs-resteasy/java8/build.gradle | 2 +- .../petstore/jaxrs-resteasy/java8/pom.xml | 4 ++-- .../petstore/jaxrs-resteasy/joda/build.gradle | 2 +- .../petstore/jaxrs-resteasy/joda/pom.xml | 4 ++-- .../petstore/jaxrs/jersey1-useTags/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey1/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey2/pom.xml | 6 ++--- .../petstore/spring-mvc-j8-async/pom.xml | 2 +- .../spring-mvc-j8-localdatetime/pom.xml | 2 +- samples/server/petstore/spring-mvc/pom.xml | 2 +- .../petstore/springboot-delegate-j8/pom.xml | 2 +- samples/server/petstore/undertow/pom.xml | 2 +- 102 files changed, 255 insertions(+), 255 deletions(-) diff --git a/modules/swagger-codegen-maven-plugin/examples/java-client.xml b/modules/swagger-codegen-maven-plugin/examples/java-client.xml index 16520f1dd03..64d6842c843 100644 --- a/modules/swagger-codegen-maven-plugin/examples/java-client.xml +++ b/modules/swagger-codegen-maven-plugin/examples/java-client.xml @@ -43,7 +43,7 @@ - + io.swagger swagger-annotations @@ -52,7 +52,7 @@ - + org.glassfish.jersey.core @@ -96,7 +96,7 @@ jackson-jaxrs-json-provider ${jackson-version} - + com.fasterxml.jackson.datatype @@ -107,20 +107,20 @@ joda-time joda-time ${jodatime-version} - + com.brsanthu migbase64 2.2 - + - + 1.5.21 2.29.1 - 2.10.1 + 2.11.4 2.7 1.0.0 4.13.1 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 index e657e2a980b..5f13c2adec2 100644 --- 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.10.1. 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.10.1"); - supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.29.1. JSON processing: Jackson 2.10.1"); + supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.11.4. 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.11.4"); + supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.29.1. JSON processing: Jackson 2.11.4"); 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.10.1"); - supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.10.1"); - supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.10.1"); - supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.10.1"); + supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.11.4"); + supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.11.4"); + supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.11.4"); + supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.11.4"); 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/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache index cc54061bf46..51150d40c6e 100644 --- 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.10.1" + jackson_version = "2.11.4" } 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 index fea6862b58a..db2779ee39f 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -102,7 +102,7 @@ if(hasProperty('target') && target == 'android') { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } - + task sourcesJar(type: Jar, dependsOn: classes) { classifier = 'sources' from sourceSets.main.allSource @@ -121,7 +121,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" + jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jersey_version = "1.19.4" jodatime_version = "2.10.5" 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 index f27554c165c..6f645bb2d39 100644 --- 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.10.1" + jackson_version = "2.11.4" {{#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 index d034b3d79e6..652a91e8374 100644 --- 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.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.11.4" % "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 index ff452b92756..808e28c7a8a 100644 --- 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 @@ 1.5.24 9.4.0 2.1.0 - 2.10.1 + 2.11.4 {{#threetenbp}} 2.6.4 {{/threetenbp}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 7dd89765de4..a6564c7bdf8 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' - + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -41,7 +41,7 @@ if(hasProperty('target') && target == 'android') { targetCompatibility JavaVersion.VERSION_1_7 {{/java8}} } - + // Rename the aar correctly libraryVariants.all { variant -> variant.outputs.each { output -> @@ -57,7 +57,7 @@ if(hasProperty('target') && target == 'android') { provided 'javax.annotation:jsr250-api:1.0' } } - + afterEvaluate { android.libraryVariants.all { variant -> def task = project.tasks.create "jar${variant.name.capitalize()}", Jar @@ -69,12 +69,12 @@ if(hasProperty('target') && target == 'android') { artifacts.add('archives', task); } } - + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' } - + artifacts { archives sourcesJar } @@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') { pom.artifactId = '{{artifactId}}' } } - + task execute(type:JavaExec) { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath @@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" google_api_client_version = "1.23.0" jersey_common_version = "2.29.1" jodatime_version = "2.10.5" diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache index 486a6eb3f07..149d96051bd 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache +++ b/modules/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.29.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", {{#withXml}} - "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.10.1" % "compile", + "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.11.4" % "compile", {{/withXml}} {{#joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4" % "compile", {{/joda}} {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4" % "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 index 56384c8cdf2..fb9203a3278 100644 --- 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 @@ 1.5.17 1.23.0 2.29.1 - 2.10.1 + 2.11.4 {{#joda}} 2.10.5 {{/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 index 3eb71af377a..5224579fc3b 100644 --- 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.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" {{#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 index ee4854b08ab..38681c33e33 100644 --- 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 @@ -14,14 +14,14 @@ lazy val root = (project in file(".")). "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.29.1"{{/supportJava6}}, {{^supportJava6}}"org.glassfish.jersey.inject" % "jersey-hk2" % "2.29.1",{{/supportJava6}} "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.29.1"{{/supportJava6}}, - "com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile", {{#joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4" % "compile", {{/joda}} {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4" % "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 index 980c5b2364a..1dc01d43ad1 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -327,7 +327,7 @@ 2.5 3.6 {{/supportJava6}} - {{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} + {{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} 1.0.0 4.13.1 diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index a36042f1aac..6f5769c5bae 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -240,7 +240,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 {{/notNullJacksonAnnotation}} {{#performBeanValidation}} 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 index 952d86a3784..1a99155c3dc 100644 --- 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,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.8" - jackson_version = "2.10.1" + jackson_version = "2.11.4" threetenbp_version = "2.6.4" jersey_version = "2.22.2" resteasy_version = "3.1.3.Final" 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 index 5bc2dc33bde..049cc4526c3 100644 --- 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.10.1", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4", {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4", {{/java8}} {{^java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4", "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 index 45839204d27..b0b172bc333 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -249,7 +249,7 @@ UTF-8 1.5.24 3.1.3.Final - 2.10.1 + 2.11.4 2.6.4 {{^java8}} 2.10.5 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 index 5977526e20a..7678e70f27f 100644 --- 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 @@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' - + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -41,7 +41,7 @@ if(hasProperty('target') && target == 'android') { targetCompatibility JavaVersion.VERSION_1_7 {{/java8}} } - + // Rename the aar correctly libraryVariants.all { variant -> variant.outputs.each { output -> @@ -57,7 +57,7 @@ if(hasProperty('target') && target == 'android') { provided 'javax.annotation:jsr250-api:1.0' } } - + afterEvaluate { android.libraryVariants.all { variant -> def task = project.tasks.create "jar${variant.name.capitalize()}", Jar @@ -69,12 +69,12 @@ if(hasProperty('target') && target == 'android') { artifacts.add('archives', task); } } - + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' } - + artifacts { archives sourcesJar } @@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') { pom.artifactId = '{{artifactId}}' } } - + task execute(type:JavaExec) { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath @@ -107,7 +107,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.10.5" 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 index 193057b2e25..f40dbce7570 100644 --- 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 @@ UTF-8 1.5.17 4.3.9.RELEASE - 2.10.1 + 2.11.4 {{#joda}} 2.10.5 {{/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 index cf7fe35cc26..2ab286a5f5a 100644 --- 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.7.1" {{#usePlayWS}} {{#play24}} - jackson_version = "2.10.1" + jackson_version = "2.11.4" play_version = "2.4.11" {{/play24}} {{#play25}} - jackson_version = "2.10.1" + jackson_version = "2.11.4" 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 index 45ba58b4237..59907e1c9e0 100644 --- 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.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", {{/play24}} {{#play25}} "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "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 index c21402a8bf6..69b771ca802 100644 --- 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 @@ 1.5.24 {{#usePlayWS}} {{#play24}} - 2.10.1 + 2.11.4 2.4.11 {{/play24}} {{#play25}} - 2.10.1 + 2.11.4 2.5.15 {{/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 index 61076a5813b..5b22d31287f 100644 --- 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 @@ -28,7 +28,7 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.24" {{#threetenbp}}threetenbp_version = "2.6.4"{{/threetenbp}} - jackson_version = "2.10.1" + jackson_version = "2.11.4" vertx_version = "3.4.2" junit_version = "4.12" } 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 index b41c52b821d..e5fda21a74e 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache @@ -274,7 +274,7 @@ 3.4.2 1.5.24 {{#threetenbp}}2.6.4{{/threetenbp}} - 2.10.1 + 2.11.4 4.13.1 diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache index 623eaba6d56..d1da5f101a7 100644 --- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache @@ -329,7 +329,7 @@ 2.5 3.6 {{/supportJava6}} - {{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} + {{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} 1.0.0 4.13.1 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 index df308b9d1e3..40302e17b25 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache @@ -66,7 +66,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.1 + 2.11.4 @@ -75,7 +75,7 @@ swagger-annotations [1.5.3,1.5.16] - + {{#useBeanValidation}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache index 622a7173201..239c5a66d2c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -122,7 +122,7 @@ ${cxf-version} test - + org.apache.cxf @@ -168,13 +168,13 @@ ${jackson-jaxrs-version} {{/java8}} -{{#useBeanValidationFeature}} +{{#useBeanValidationFeature}} org.hibernate hibernate-validator 5.2.2.Final -{{/useBeanValidationFeature}} +{{/useBeanValidationFeature}} @@ -194,11 +194,11 @@ 4.13.1 1.1.7 2.5 -{{#useBeanValidation}} +{{#useBeanValidation}} 1.1.0.Final -{{/useBeanValidation}} +{{/useBeanValidation}} 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 96f8670ad35..5fb91027a78 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -79,7 +79,7 @@ - + maven-war-plugin @@ -131,7 +131,7 @@ ${cxf-version} test - + org.apache.cxf @@ -183,7 +183,7 @@ ${jackson-jaxrs-version} {{/java8}} -{{#generateSpringApplication}} +{{#generateSpringApplication}} org.springframework @@ -194,7 +194,7 @@ org.springframework spring-web ${spring-version} - + {{/generateSpringApplication}} {{#generateSpringBootApplication}} @@ -211,7 +211,7 @@ ${spring.boot-version} test - + org.apache.cxf cxf-spring-boot-starter-jaxrs @@ -245,17 +245,17 @@ 4.13.1 1.1.7 2.5 -{{#useBeanValidation}} +{{#useBeanValidation}} 1.1.0.Final -{{/useBeanValidation}} -{{#generateSpringApplication}} +{{/useBeanValidation}} +{{#generateSpringApplication}} 4.3.13.RELEASE -{{/generateSpringApplication}} +{{/generateSpringApplication}} {{#generateSpringBootApplication}} 1.5.9.RELEASE -{{/generateSpringBootApplication}} +{{/generateSpringBootApplication}} 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 00f915c8daa..803a424ce2d 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -175,7 +175,7 @@ validation-api 1.1.0.Final -{{/useBeanValidation}} +{{/useBeanValidation}} @@ -193,7 +193,7 @@ 1.5.24 9.3.27.v20190418 1.19.1 - 2.10.1 + 2.11.4 1.7.21 4.13.1 2.5 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index ac8e9530dc1..c9a8efa21c2 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -13,7 +13,7 @@ repo - + src/main/java @@ -172,7 +172,7 @@ ${commons_io_version} {{/supportJava6}} - + {{#useBeanValidation}} @@ -199,7 +199,7 @@ 1.5.24 9.3.27.v20190418 2.22.2 - 2.10.1 + 2.11.4 {{#supportJava6}} 2.5 3.5 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index 069226075dc..507a2e5c9c5 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/swagger-codegen/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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' compile 'joda-time:joda-time:2.7' {{/java8}} {{#java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4' {{/java8}} testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index adbfb207fed..3cc0ef7a04b 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -187,30 +187,30 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 + 2.11.4 {{/java8}} {{#java8}} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.10.1 + 2.11.4 {{/java8}} com.fasterxml.jackson.core jackson-databind - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-core - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 org.apache.httpcomponents diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index 1989cbcbd29..f02f6c43c1c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -21,10 +21,10 @@ dependencies { providedCompile 'javax.validation:validation-api:1.1.0.Final' {{/useBeanValidation}} {{#java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4' {{/java8}} {{^java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' compile 'joda-time:joda-time:2.7' {{/java8}} //TODO: swaggerFeature diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache index b3d8dc52005..b1b7456a469 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -165,8 +165,8 @@ 1.1.0.Final provided -{{/useBeanValidation}} - +{{/useBeanValidation}} + @@ -184,6 +184,6 @@ 1.6.3 4.13.1 2.5 - 2.10.1 + 2.11.4 diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index 41b15474aa8..abc1eb0efd7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -60,7 +60,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.10.1 + 2.11.4 {{/withXml}} @@ -69,7 +69,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.10.1 + 2.11.4 {{/java8}} {{#joda}} @@ -77,7 +77,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 + 2.11.4 {{/joda}} {{#threetenbp}} @@ -99,7 +99,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 {{/notNullJacksonAnnotation}} diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index 57116134cc3..65cd773da2b 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -56,7 +56,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.10.1 + 2.11.4 {{/withXml}} @@ -65,7 +65,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.10.1 + 2.11.4 {{/java8}} {{#joda}} @@ -73,7 +73,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 + 2.11.4 {{/joda}} {{#threetenbp}} @@ -97,7 +97,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 {{/notNullJacksonAnnotation}} diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 05b160fd4c6..35127835154 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -204,7 +204,7 @@ 4.13.1 2.5 2.7.0 - 2.10.1 + 2.11.4 2.6.4 4.3.9.RELEASE diff --git a/modules/swagger-codegen/src/main/resources/JavaVertXServer/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaVertXServer/pom.mustache index 21f386ada11..85b4f72143c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaVertXServer/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaVertXServer/pom.mustache @@ -1,14 +1,14 @@ 4.0.0 - + {{groupId}} {{artifactId}} {{artifactVersion}} jar - + {{appName}} - + UTF-8 1.8 @@ -17,7 +17,7 @@ 3.3 {{vertxSwaggerRouterVersion}} 2.3 - 2.10.1 + 2.11.4 @@ -59,7 +59,7 @@ ${java.version} - + org.apache.maven.plugins maven-shade-plugin @@ -88,4 +88,4 @@ - \ No newline at end of file + diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache index 0906287c179..4ef5491b7d4 100644 --- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache @@ -3,7 +3,7 @@ org.wso2.msf4j msf4j-service 2.0.0 - + 4.0.0 {{groupId}} {{artifactId}} @@ -59,8 +59,8 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 - + 2.11.4 + diff --git a/modules/swagger-codegen/src/main/resources/undertow/pom.mustache b/modules/swagger-codegen/src/main/resources/undertow/pom.mustache index 599bb153963..4f6f71a2ccb 100644 --- a/modules/swagger-codegen/src/main/resources/undertow/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/undertow/pom.mustache @@ -16,7 +16,7 @@ 1.8 UTF-8 0.1.1 - 2.10.1 + 2.11.4 1.7.21 0.5.2 4.5.3 diff --git a/pom.xml b/pom.xml index 48068dad927..6d677193060 100644 --- a/pom.xml +++ b/pom.xml @@ -937,7 +937,7 @@ 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.bash b/pom.xml.bash index 03737f1f34f..52c5a1b61f6 100644 --- a/pom.xml.bash +++ b/pom.xml.bash @@ -905,11 +905,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.circleci b/pom.xml.circleci index debb7823a79..58a4fadc7b7 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -953,11 +953,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.circleci.java7 b/pom.xml.circleci.java7 index 625aa2d622e..cf66ad979b3 100644 --- a/pom.xml.circleci.java7 +++ b/pom.xml.circleci.java7 @@ -935,11 +935,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.ios b/pom.xml.ios index 6ef228d2429..31efa115278 100644 --- a/pom.xml.ios +++ b/pom.xml.ios @@ -913,11 +913,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.jenkins b/pom.xml.jenkins index 9e653ed002f..02481bc570a 100644 --- a/pom.xml.jenkins +++ b/pom.xml.jenkins @@ -995,11 +995,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.jenkins.java7 b/pom.xml.jenkins.java7 index b2b7f0c9cce..7e42ab38977 100644 --- a/pom.xml.jenkins.java7 +++ b/pom.xml.jenkins.java7 @@ -917,11 +917,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/pom.xml.travis b/pom.xml.travis index 6ea7236a545..1742b236653 100644 --- a/pom.xml.travis +++ b/pom.xml.travis @@ -934,11 +934,11 @@ 1.0.54 2.11.1 3.3.0 - 1.6.1 + 1.6.2 2.4 1.2 4.13.1 - 2.10.1 + 2.11.4 1.0.0 3.4 1.7.12 diff --git a/samples/client/petstore/groovy/build.gradle b/samples/client/petstore/groovy/build.gradle index cc54061bf46..51150d40c6e 100644 --- a/samples/client/petstore/groovy/build.gradle +++ b/samples/client/petstore/groovy/build.gradle @@ -24,7 +24,7 @@ repositories { ext { swagger_annotations_version = "1.5.8" - jackson_version = "2.10.1" + jackson_version = "2.11.4" } dependencies { diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index 4f1ab5acc60..cb4cff18558 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.9" - jackson_version = "2.10.1" + jackson_version = "2.11.4" threepane_version = "2.6.4" feign_version = "9.4.0" feign_form_version = "2.1.0" diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt index d79374bf81e..5b81eb30e57 100644 --- a/samples/client/petstore/java/feign/build.sbt +++ b/samples/client/petstore/java/feign/build.sbt @@ -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.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4" % "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/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 8b9331ebddf..3a1c9215eb4 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -271,7 +271,7 @@ 1.5.24 9.4.0 2.1.0 - 2.10.1 + 2.11.4 2.6.4 4.13.1 1.0.0 diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index d1ec8e93f45..0530780ac5c 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' - + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -35,7 +35,7 @@ if(hasProperty('target') && target == 'android') { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - + // Rename the aar correctly libraryVariants.all { variant -> variant.outputs.each { output -> @@ -51,7 +51,7 @@ if(hasProperty('target') && target == 'android') { provided 'javax.annotation:jsr250-api:1.0' } } - + afterEvaluate { android.libraryVariants.all { variant -> def task = project.tasks.create "jar${variant.name.capitalize()}", Jar @@ -63,12 +63,12 @@ if(hasProperty('target') && target == 'android') { artifacts.add('archives', task); } } - + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' } - + artifacts { archives sourcesJar } @@ -86,7 +86,7 @@ if(hasProperty('target') && target == 'android') { pom.artifactId = 'swagger-petstore-google-api-client' } } - + task execute(type:JavaExec) { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath @@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" google_api_client_version = "1.23.0" jersey_common_version = "2.29.1" jodatime_version = "2.10.5" diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt index 7374e3dac71..69452f52c2f 100644 --- a/samples/client/petstore/java/google-api-client/build.sbt +++ b/samples/client/petstore/java/google-api-client/build.sbt @@ -12,9 +12,9 @@ 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.29.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml index 1b636f1f912..9118024f60c 100644 --- a/samples/client/petstore/java/google-api-client/pom.xml +++ b/samples/client/petstore/java/google-api-client/pom.xml @@ -250,7 +250,7 @@ 1.5.17 1.23.0 2.29.1 - 2.10.1 + 2.11.4 2.6.4 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index 7e25856a6c7..8e72814ac27 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" jersey_version = "2.29.1" junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index b227bd887f2..08a2bb69d7e 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -14,10 +14,10 @@ lazy val root = (project in file(".")). "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.29.1", "org.glassfish.jersey.inject" % "jersey-hk2" % "2.29.1", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.29.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.11.4" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 1c5b537d4a3..7a7bcf64151 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -258,7 +258,7 @@ UTF-8 1.5.24 2.29.1 - 2.10.1 + 2.11.4 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index 9ac0e1042e7..d4ac8cccb40 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" jersey_version = "2.29.1" junit_version = "4.12" } diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index 9edf2abc8d6..184525d1c3b 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.8" - jackson_version = "2.10.1" + jackson_version = "2.11.4" threetenbp_version = "2.6.4" jersey_version = "2.22.2" resteasy_version = "3.1.3.Final" diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index df074ed7513..64f803d34dc 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -13,10 +13,10 @@ 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.10.1", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.11.4", "joda-time" % "joda-time" % "2.9.4", "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.12" % "test", diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index 0c4ffc42e46..8776779d2d1 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -210,7 +210,7 @@ UTF-8 1.5.24 3.1.3.Final - 2.10.1 + 2.11.4 2.6.4 2.10.5 1.0.0 diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index 4dd43295df1..413d5176d2f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' - + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -35,7 +35,7 @@ if(hasProperty('target') && target == 'android') { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - + // Rename the aar correctly libraryVariants.all { variant -> variant.outputs.each { output -> @@ -51,7 +51,7 @@ if(hasProperty('target') && target == 'android') { provided 'javax.annotation:jsr250-api:1.0' } } - + afterEvaluate { android.libraryVariants.all { variant -> def task = project.tasks.create "jar${variant.name.capitalize()}", Jar @@ -63,12 +63,12 @@ if(hasProperty('target') && target == 'android') { artifacts.add('archives', task); } } - + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' } - + artifacts { archives sourcesJar } @@ -86,7 +86,7 @@ if(hasProperty('target') && target == 'android') { pom.artifactId = 'swagger-pestore-resttemplate-withxml' } } - + task execute(type:JavaExec) { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath @@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.10.5" junit_version = "4.12" diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index 3b4c8aa7e3a..25f133e2e8d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -258,7 +258,7 @@ UTF-8 1.5.17 4.3.9.RELEASE - 2.10.1 + 2.11.4 2.6.4 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 8cd5a020270..d361efd6be6 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -23,7 +23,7 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' - + android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -35,7 +35,7 @@ if(hasProperty('target') && target == 'android') { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - + // Rename the aar correctly libraryVariants.all { variant -> variant.outputs.each { output -> @@ -51,7 +51,7 @@ if(hasProperty('target') && target == 'android') { provided 'javax.annotation:jsr250-api:1.0' } } - + afterEvaluate { android.libraryVariants.all { variant -> def task = project.tasks.create "jar${variant.name.capitalize()}", Jar @@ -63,12 +63,12 @@ if(hasProperty('target') && target == 'android') { artifacts.add('archives', task); } } - + task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' } - + artifacts { archives sourcesJar } @@ -86,7 +86,7 @@ if(hasProperty('target') && target == 'android') { pom.artifactId = 'swagger-petstore-resttemplate' } } - + task execute(type:JavaExec) { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath @@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.24" - jackson_version = "2.10.1" + jackson_version = "2.11.4" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.10.5" junit_version = "4.12" diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index cfd623ae48f..3e508cfeea6 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -250,7 +250,7 @@ UTF-8 1.5.17 4.3.9.RELEASE - 2.10.1 + 2.11.4 2.6.4 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index 1a54095cf2e..3b2ea276179 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.7.1" - jackson_version = "2.10.1" + jackson_version = "2.11.4" play_version = "2.4.11" swagger_annotations_version = "1.5.24" junit_version = "4.12" diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt index 4aeba14e181..de674e56c3d 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.sbt +++ b/samples/client/petstore/java/retrofit2-play24/build.sbt @@ -12,9 +12,9 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "retrofit" % "2.7.1" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.7.1" % "compile", "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "io.swagger" % "swagger-annotations" % "1.5.24" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index 1b3fae04b3f..4c5b36822fa 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -273,7 +273,7 @@ ${java.version} 1.8.3 1.5.18 - 2.10.1 + 2.11.4 2.4.11 2.3.0 1.0.1 diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle index 2856c5fddf1..9ee3c9e2980 100644 --- a/samples/client/petstore/java/retrofit2-play25/build.gradle +++ b/samples/client/petstore/java/retrofit2-play25/build.gradle @@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.7.1" - jackson_version = "2.10.1" + jackson_version = "2.11.4" play_version = "2.5.14" swagger_annotations_version = "1.5.24" junit_version = "4.12" diff --git a/samples/client/petstore/java/retrofit2-play25/build.sbt b/samples/client/petstore/java/retrofit2-play25/build.sbt index f776b55b00f..a2ecf79fae6 100644 --- a/samples/client/petstore/java/retrofit2-play25/build.sbt +++ b/samples/client/petstore/java/retrofit2-play25/build.sbt @@ -12,9 +12,9 @@ lazy val root = (project in file(".")). "joda-time" % "joda-time" % "2.10.5" % "compile",% "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.7.1" % "compile", "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.11.4" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "io.swagger" % "swagger-annotations" % "1.5.24" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml index 2a882074f34..9508f3279f1 100644 --- a/samples/client/petstore/java/retrofit2-play25/pom.xml +++ b/samples/client/petstore/java/retrofit2-play25/pom.xml @@ -278,7 +278,7 @@ ${java.version} 1.8.3 1.5.24 - 2.10.1 + 2.11.4 2.5.15 2.3.0 1.4.1 diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index d43aea604d2..3cd59d132e2 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -28,7 +28,7 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.24" threetenbp_version = "2.6.4" - jackson_version = "2.10.1" + jackson_version = "2.11.4" vertx_version = "3.4.2" junit_version = "4.12" } diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml index f28e64b60f2..8a208530e5b 100644 --- a/samples/client/petstore/java/vertx/pom.xml +++ b/samples/client/petstore/java/vertx/pom.xml @@ -263,7 +263,7 @@ 3.4.2 1.5.24 2.6.4 - 2.10.1 + 2.11.4 4.13.1 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 5d3625b0d4d..9ee89a973c3 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -111,7 +111,7 @@ ${cxf-version} test - + org.apache.cxf @@ -168,7 +168,7 @@ 1.1.7 2.5 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index 7c5b9f5336c..b417ca41fd7 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -3,7 +3,7 @@ org.wso2.msf4j msf4j-service 2.0.0 - + 4.0.0 io.swagger swagger-msf4j-server @@ -59,8 +59,8 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 - + 2.11.4 + diff --git a/samples/server/petstore/java-vertx/async/pom.xml b/samples/server/petstore/java-vertx/async/pom.xml index 35b9f92537a..de0ab55078e 100644 --- a/samples/server/petstore/java-vertx/async/pom.xml +++ b/samples/server/petstore/java-vertx/async/pom.xml @@ -17,7 +17,7 @@ 3.3 1.2.0 2.3 - 2.10.1 + 2.11.4 @@ -88,4 +88,4 @@ - \ No newline at end of file + diff --git a/samples/server/petstore/java-vertx/rx/pom.xml b/samples/server/petstore/java-vertx/rx/pom.xml index 14f9492955b..df9f6783831 100644 --- a/samples/server/petstore/java-vertx/rx/pom.xml +++ b/samples/server/petstore/java-vertx/rx/pom.xml @@ -17,7 +17,7 @@ 3.3 1.2.0 2.3 - 2.10.1 + 2.11.4 @@ -88,4 +88,4 @@ - \ No newline at end of file + diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index c4e28cfabe0..dabfd040341 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -77,7 +77,7 @@ - + maven-war-plugin @@ -127,7 +127,7 @@ ${cxf-version} test - + org.apache.cxf @@ -191,7 +191,7 @@ 2.5 1.1.0.Final 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml index 9ad98e572fc..ab16f6abcc5 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml @@ -66,7 +66,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.1 + 2.11.4 diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index b49511c7eab..561698e0fa9 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -77,7 +77,7 @@ - + maven-war-plugin @@ -127,7 +127,7 @@ ${cxf-version} test - + org.apache.cxf @@ -191,7 +191,7 @@ 2.5 1.1.0.Final 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index de105379804..1d0b87a6a69 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -79,7 +79,7 @@ - + maven-war-plugin @@ -129,7 +129,7 @@ ${cxf-version} test - + org.apache.cxf @@ -193,7 +193,7 @@ 2.5 1.1.0.Final 3.2.1 - 2.10.1 + 2.11.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle index 1c222c6c305..63b1eb9b8c3 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle @@ -18,7 +18,7 @@ dependencies { compile 'io.swagger:swagger-annotations:1.5.10' 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature compile 'io.swagger:swagger-jaxrs:1.5.12' diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index 58539ab47be..60bcb289f2e 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -155,7 +155,7 @@ 1.1.0.Final provided - + @@ -173,6 +173,6 @@ 1.6.3 4.13.1 2.5 - 2.10.1 + 2.11.4 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle index 705542eb22f..899d68440d9 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4' 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 1f21b3a667c..4decbb4b85a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -179,22 +179,22 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-databind - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-core - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 org.apache.httpcomponents diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index 4b3b0cd3a12..93b74ad2d20 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' 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 836c03ec246..8ab7be0413b 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -184,22 +184,22 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-databind - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-core - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 org.apache.httpcomponents diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index 4b3b0cd3a12..93b74ad2d20 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' 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 fcdd37de5bd..a2a3e4c85d3 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -184,22 +184,22 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-databind - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-core - 2.10.1 + 2.11.4 com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.11.4 org.apache.httpcomponents diff --git a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle index 13f56e928fa..7e258ae575e 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle @@ -18,7 +18,7 @@ dependencies { compile 'io.swagger:swagger-annotations:1.5.10' 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4' //TODO: swaggerFeature compile 'io.swagger:swagger-jaxrs:1.5.12' diff --git a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml index 0fdc437f306..77abc65d8bf 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml @@ -150,7 +150,7 @@ 1.1.0.Final provided - + @@ -168,6 +168,6 @@ 1.6.3 4.13.1 2.5 - 2.10.1 + 2.11.4 diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle index 1c222c6c305..63b1eb9b8c3 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle @@ -18,7 +18,7 @@ dependencies { compile 'io.swagger:swagger-annotations:1.5.10' 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.10.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.11.4' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature compile 'io.swagger:swagger-jaxrs:1.5.12' diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index c149bebddc2..e96a8a8c9fe 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -155,7 +155,7 @@ 1.1.0.Final provided - + @@ -173,6 +173,6 @@ 1.6.3 4.13.1 2.5 - 2.10.1 + 2.11.4 diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml index 8781b88a412..2751650c45c 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml @@ -191,7 +191,7 @@ 1.5.24 9.3.27.v20190418 1.19.1 - 2.10.1 + 2.11.4 1.7.21 4.13.1 2.5 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index 27fecb2251e..b8f5b0d5b39 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -191,7 +191,7 @@ 1.5.24 9.3.27.v20190418 1.19.1 - 2.10.1 + 2.11.4 1.7.21 4.13.1 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 7f3f8f30fb0..2ff3a2b1e2b 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -13,7 +13,7 @@ repo - + src/main/java @@ -150,7 +150,7 @@ 2.2 - + javax.validation @@ -175,7 +175,7 @@ 1.5.24 9.3.27.v20190418 2.22.2 - 2.10.1 + 2.11.4 4.13.1 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 3bfdcb33b3c..c964f3c165f 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -167,7 +167,7 @@ 4.13.1 2.5 2.7.0 - 2.10.1 + 2.11.4 2.6.4 4.3.9.RELEASE diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml index 97c00718ee5..93250828f96 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml @@ -167,7 +167,7 @@ 4.13.1 2.5 2.7.0 - 2.10.1 + 2.11.4 2.6.4 4.3.9.RELEASE diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index ec5d38e0726..86d5b18318d 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -167,7 +167,7 @@ 4.13.1 2.5 2.7.0 - 2.10.1 + 2.11.4 2.6.4 4.3.9.RELEASE diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index 31223107aff..5bf29c050eb 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -56,7 +56,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.10.1 + 2.11.4 diff --git a/samples/server/petstore/undertow/pom.xml b/samples/server/petstore/undertow/pom.xml index 77f1fe52ad2..e8d2b4600fe 100644 --- a/samples/server/petstore/undertow/pom.xml +++ b/samples/server/petstore/undertow/pom.xml @@ -16,7 +16,7 @@ 1.8 UTF-8 0.1.1 - 2.10.1 + 2.11.4 1.7.21 0.5.2 4.5.3