Merge branch 'master' into patch-1

Author: HugoMario

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.35-SNAPSHOT</version>
+    <version>1.0.36-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -254,9 +254,9 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.35-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.30</swagger-parser-version>
-        <swagger-core-version>2.1.13</swagger-core-version>
+        <swagger-codegen-version>3.0.36-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.1.2</swagger-parser-version>
+        <swagger-core-version>2.2.2</swagger-core-version>
         <jackson-version>2.13.2</jackson-version>
         <!--
           jackson-databind 2.13.2 is still affected by CVE-2020-36518.

src/main/resources/handlebars/Java/build.gradle.mustache

@@ -112,7 +112,7 @@ ext {
     {{^useOas2}}
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
-    jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
+    jackson_version = "2.10.1"
     jersey_version = "1.19.4"
     jodatime_version = "2.9.9"
     junit_version = "4.12"
@@ -138,7 +138,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:2.6.4"
     {{/threetenbp}}
     {{^java8}}
     compile "com.brsanthu:migbase64:2.2"

src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache

@@ -110,8 +110,8 @@ ext {
     {{#threetenbp}}
     threepane_version = "2.6.4"
     {{/threetenbp}}
-    feign_version = "9.4.0"
-    feign_form_version = "2.1.0"
+    feign_version = "11.6"
+    feign_form_version = "3.8.0"
     junit_version = "4.12"
     oltu_version = "1.0.2"
 }
@@ -123,9 +123,9 @@ dependencies {
     {{^useOas2}}
     compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
     {{/useOas2}}
-    compile "com.netflix.feign:feign-core:$feign_version"
-    compile "com.netflix.feign:feign-jackson:$feign_version"
-    compile "com.netflix.feign:feign-slf4j:$feign_version"
+    compile "io.github.openfeign:feign-core:$feign_version"
+    compile "io.github.openfeign:feign-jackson:$feign_version"
+    compile "io.github.openfeign:feign-slf4j:$feign_version"
     compile "io.github.openfeign.form:feign-form:$feign_form_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"

src/main/resources/handlebars/Java/libraries/resteasy/build.gradle.mustache

@@ -111,7 +111,7 @@ ext {
     {{^useOas2}}
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
-    jackson_version = "2.7.5"
+    jackson_version = "2.10.1"
     jersey_version = "2.22.2"
     {{^java8}}
     jodatime_version = "2.9.4"

src/main/resources/handlebars/Java/libraries/resttemplate/build.gradle.mustache

@@ -112,7 +112,7 @@ ext {
     {{^useOas2}}
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
-    jackson_version = "2.8.9"
+    jackson_version = "2.10.1"
     spring_web_version = "4.3.9.RELEASE"
     jodatime_version = "2.9.9"
     junit_version = "4.12"

src/main/resources/handlebars/Java/libraries/retrofit2/build.gradle.mustache

@@ -104,13 +104,12 @@ ext {
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
     {{#play24}}
-    jackson_version = "2.6.6"
     play_version = "2.4.11"
     {{/play24}}
     {{#play25}}
-    jackson_version = "2.7.8"
     play_version = "2.5.14"
     {{/play25}}
+    jackson_version = "2.10.1"
     {{/usePlayWS}}
     {{#useOas2}}
     swagger_annotations_version = "1.5.15"

src/main/resources/handlebars/JavaJaxRS/resteasy/eap/gradle.mustache

@@ -25,6 +25,7 @@ dependencies {
 {{#java8}}
     compile         'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1'
 {{/java8}}
+    compile         'com.fasterxml.jackson.core:jackson-databind:2.10.1'
     testCompile     'junit:junit:4.12',
                     'org.hamcrest:hamcrest-core:1.3'
 }

src/main/resources/handlebars/JavaJaxRS/resteasy/gradle.mustache

@@ -33,6 +33,7 @@ dependencies {
 {{#java8}}
     compile         'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1'
 {{/java8}}
+    compile         'com.fasterxml.jackson.core:jackson-databind:2.10.1'
     //TODO: swaggerFeature
     {{#useOas2}}
     compile 'io.swagger:swagger-jaxrs:1.5.12'

src/test/java/io/swagger/codegen/v3/generators/java/JavaModelEnumTest.java

@@ -119,7 +119,7 @@ public void overrideEnumTest() {
         parentModel.setProperties(parentProperties);
         parentModel.name("parentModel");
 
-        final ComposedSchema composedSchema = new ComposedSchema()
+        final ComposedSchema composedSchema = (ComposedSchema)new ComposedSchema()
                 .addAllOfItem(new Schema().$ref(parentModel.getName()));
 
         final DefaultCodegenConfig codegen = new JavaClientCodegen();