loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java] fix jackson-databind-nullable version variable due to Gradle Incompatibility (Template Update) (#4148)

Browse Source 
* Replaced dashes with underscores in build.gradle files.

* Updated mustache template files
This commit is contained in:
gurumeditator 2019-10-14 10:25:50 -04:00 committed by William Cheng
parent e6fcfdf184
commit ec4ac07dfe
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/Java/build.gradle.mustache vendored
View File

@ -138,7 +138,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" 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_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" jersey_version = "1.19.4"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
@ -153,7 +153,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_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}} {{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}} {{/joda}}

4
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache vendored
View File

@ -122,7 +122,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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}} {{#threetenbp}}
threepane_version = "2.6.4" threepane_version = "2.6.4"
{{/threetenbp}} {{/threetenbp}}
@ -142,7 +142,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_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}} {{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}} {{/joda}}

4
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache vendored
View File

@ -122,7 +122,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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" google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1" jersey_common_version = "2.25.1"
jodatime_version = "2.9.9" 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-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_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}} {{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}} {{/java8}}

4
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache vendored
View File

@ -121,7 +121,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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}} {{#supportJava6}}
jersey_version = "2.6" jersey_version = "2.6"
commons_io_version=2.5 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-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_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}} {{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}} {{/joda}}

4
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache vendored
View File

@ -101,7 +101,7 @@ ext {
{{#jackson}} {{#jackson}}
jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" 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_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}} {{/jackson}}
{{#gson}} {{#gson}}
gson_version = "2.8.5" 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-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_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}} {{/jackson}}
{{#gson}} {{#gson}}
compile "io.gsonfire:gson-fire:$gson_fire_version" compile "io.gsonfire:gson-fire:$gson_fire_version"

4
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache vendored
View File

@ -121,7 +121,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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" threetenbp_version = "2.6.4"
resteasy_version = "3.1.3.Final" resteasy_version = "3.1.3.Final"
{{^java8}} {{^java8}}
@ -144,7 +144,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_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}} {{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}} {{/java8}}

4
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache vendored
View File

@ -122,7 +122,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
@ -139,7 +139,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_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}} {{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}} {{/java8}}

4
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache vendored
View File

@ -133,7 +133,7 @@ ext {
{{#play26}} {{#play26}}
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_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" play_version = "2.6.7"
{{/play26}} {{/play26}}
{{/usePlayWS}} {{/usePlayWS}}
@ -190,7 +190,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_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" compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version"
{{/usePlayWS}} {{/usePlayWS}}