From d1089f1bc5b2d05d1df36448fb6f1c1d1c932cf8 Mon Sep 17 00:00:00 2001 From: gurumeditator Date: Mon, 7 Oct 2019 11:43:36 -0400 Subject: [PATCH 1/2] Replaced dashes with underscores in build.gradle files. --- samples/client/petstore/java/feign/build.gradle | 4 ++-- samples/client/petstore/java/feign10x/build.gradle | 4 ++-- samples/client/petstore/java/google-api-client/build.gradle | 4 ++-- samples/client/petstore/java/jersey1/build.gradle | 4 ++-- samples/client/petstore/java/jersey2-java8/build.gradle | 4 ++-- samples/client/petstore/java/jersey2/build.gradle | 4 ++-- samples/client/petstore/java/resteasy/build.gradle | 4 ++-- .../client/petstore/java/resttemplate-withXml/build.gradle | 4 ++-- samples/client/petstore/java/resttemplate/build.gradle | 4 ++-- samples/client/petstore/java/retrofit2-play24/build.gradle | 2 +- samples/client/petstore/java/retrofit2-play25/build.gradle | 2 +- samples/client/petstore/java/retrofit2-play26/build.gradle | 4 ++-- samples/client/petstore/java/webclient/build.gradle | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index 94d0029825aa..51158af50d78 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -98,7 +98,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" threepane_version = "2.6.4" feign_version = "9.7.0" feign_form_version = "2.1.0" @@ -116,7 +116,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "com.brsanthu:migbase64:2.2" diff --git a/samples/client/petstore/java/feign10x/build.gradle b/samples/client/petstore/java/feign10x/build.gradle index 7aaee78ff4bf..0d6878503c45 100644 --- a/samples/client/petstore/java/feign10x/build.gradle +++ b/samples/client/petstore/java/feign10x/build.gradle @@ -98,7 +98,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" threepane_version = "2.6.4" feign_version = "10.2.3" feign_form_version = "2.1.0" @@ -116,7 +116,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "com.brsanthu:migbase64:2.2" diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index 208d7a57dc08..a16b641c1a69 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -98,7 +98,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" @@ -115,7 +115,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle index d372e0398872..e94fca44498e 100644 --- a/samples/client/petstore/java/jersey1/build.gradle +++ b/samples/client/petstore/java/jersey1/build.gradle @@ -114,7 +114,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.6.4" jackson_databind_version = "2.6.4" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.12" @@ -129,7 +129,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version" compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index 44798b9125fb..646b451a5437 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -97,7 +97,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" jersey_version = "2.27" junit_version = "4.12" } @@ -111,7 +111,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index 9f9ce6cdf768..c94a36a9fa2f 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -97,7 +97,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" jersey_version = "2.27" junit_version = "4.12" threetenbp_version = "2.6.4" @@ -112,7 +112,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index 0fa0a028d250..cbbbb5116921 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -97,7 +97,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" threetenbp_version = "2.6.4" resteasy_version = "3.1.3.Final" jodatime_version = "2.9.9" @@ -114,7 +114,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" compile "com.brsanthu:migbase64:2.2" diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index 6345e3b0f2d6..a1b680873b25 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -98,7 +98,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" @@ -113,7 +113,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 6081aaded211..7c26e098749e 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -98,7 +98,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" @@ -113,7 +113,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index 663a8a3475c0..fc118843370c 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -119,7 +119,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle index 6070a723366e..54d850abe3e1 100644 --- a/samples/client/petstore/java/retrofit2-play25/build.gradle +++ b/samples/client/petstore/java/retrofit2-play25/build.gradle @@ -121,7 +121,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index 5a8bdb5e0540..37bbbee850c8 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -99,7 +99,7 @@ ext { retrofit_version = "2.3.0" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" play_version = "2.6.7" swagger_annotations_version = "1.5.22" junit_version = "4.12" @@ -124,7 +124,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 1637b07938f1..69b9c9a948c2 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -114,7 +114,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.12" @@ -129,7 +129,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" testCompile "junit:junit:$junit_version" } From 8df41dfbbe6140c2fdf42ff5569bdb4e76cfb160 Mon Sep 17 00:00:00 2001 From: gurumeditator Date: Mon, 14 Oct 2019 08:34:13 -0400 Subject: [PATCH 2/2] Updated mustache template files --- .../src/main/resources/Java/build.gradle.mustache | 4 ++-- .../main/resources/Java/libraries/feign/build.gradle.mustache | 4 ++-- .../Java/libraries/google-api-client/build.gradle.mustache | 4 ++-- .../resources/Java/libraries/jersey2/build.gradle.mustache | 4 ++-- .../Java/libraries/rest-assured/build.gradle.mustache | 4 ++-- .../resources/Java/libraries/resteasy/build.gradle.mustache | 4 ++-- .../Java/libraries/resttemplate/build.gradle.mustache | 4 ++-- .../resources/Java/libraries/retrofit2/build.gradle.mustache | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index 99d255c54db1..70462ccbd8e3 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -138,7 +138,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_databind_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.12" @@ -153,7 +153,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#joda}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index a92022e83aec..34a2bb98015c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -122,7 +122,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" {{#threetenbp}} threepane_version = "2.6.4" {{/threetenbp}} @@ -142,7 +142,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#joda}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 4471072ec2f1..d42c3e13899a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -122,7 +122,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" @@ -141,7 +141,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 588239f5c88f..c86178e7d040 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -121,7 +121,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" {{#supportJava6}} jersey_version = "2.6" commons_io_version=2.5 @@ -145,7 +145,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#joda}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index d67815a76aad..726c343301e5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -101,7 +101,7 @@ ext { {{#jackson}} jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_databind_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" - jackson-databind-nullable-version = 0.2.0 + jackson_databind_nullable_version = 0.2.0 {{/jackson}} {{#gson}} gson_version = "2.8.5" @@ -125,7 +125,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/jackson}} {{#gson}} compile "io.gsonfire:gson-fire:$gson_fire_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index 1c133a743537..930ae737fdcb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -121,7 +121,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" threetenbp_version = "2.6.4" resteasy_version = "3.1.3.Final" {{^java8}} @@ -144,7 +144,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 1815ab926e11..06700890574c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -122,7 +122,7 @@ ext { swagger_annotations_version = "1.5.22" jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" @@ -139,7 +139,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{#java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index cf02f243950a..85aa12d6cca7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -133,7 +133,7 @@ ext { {{#play26}} jackson_version = "2.9.10" jackson_databind_version = "2.9.10" - jackson-databind-nullable-version = "0.2.0" + jackson_databind_nullable_version = "0.2.0" play_version = "2.6.7" {{/play26}} {{/usePlayWS}} @@ -190,7 +190,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_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson-databind-nullable-version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version" {{/usePlayWS}}