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

Upgraded dependency versions

Browse Source 
Also switched from using JSR310Module (Deprecated) to JavaTimeModule.
This commit is contained in:
ant3 2016-06-21 00:14:10 +01:00
parent e40ad8ce3c
commit 4ef10aa5ae
7 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
View File

@ -71,7 +71,7 @@ public class ApiClient {
objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
{{#java8}} {{#java8}}
objectMapper.registerModule(new JSR310Module()); objectMapper.registerModule(new JavaTimeModule());
{{/java8}} {{/java8}}
{{^java8}} {{^java8}}
objectMapper.registerModule(new JodaModule()); objectMapper.registerModule(new JodaModule());

23
modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
View File

@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') {
targetSdkVersion 23 targetSdkVersion 23
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly
@ -78,8 +84,14 @@ if(hasProperty('target') && target == 'android') {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven' apply plugin: 'maven'
{{#java8}}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7
{{/java8}}
install { install {
repositories.mavenInstaller { repositories.mavenInstaller {
@ -95,9 +107,9 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
swagger_annotations_version = "1.5.8" swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0" jackson_version = "2.7.5"
jersey_version = "1.19.1" jersey_version = "1.19.1"
jodatime_version = "2.9.3" jodatime_version = "2.9.4"
junit_version = "4.12" junit_version = "4.12"
} }
@ -109,8 +121,13 @@ 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_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5" {{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}}
{{^java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
compile "joda-time:joda-time:$jodatime_version" compile "joda-time:joda-time:$jodatime_version"
{{/java8}}
compile "com.brsanthu:migbase64:2.2" compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
} }

2
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/JSON.mustache
View File

@ -25,7 +25,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
{{#java8}} {{#java8}}
mapper.registerModule(new JSR310Module()); mapper.registerModule(new JavaTimeModule());
{{/java8}} {{/java8}}
{{^java8}} {{^java8}}
mapper.registerModule(new JodaModule()); mapper.registerModule(new JodaModule());

8
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
View File

@ -106,10 +106,10 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
swagger_annotations_version = "1.5.8" swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0" jackson_version = "2.7.5"
jersey_version = "2.22.2" jersey_version = "2.22.2"
{{^java8}} {{^java8}}
jodatime_version = "2.9.3" jodatime_version = "2.9.4"
{{/java8}} {{/java8}}
junit_version = "4.12" junit_version = "4.12"
} }
@ -118,7 +118,7 @@ dependencies {
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.glassfish.jersey.core:jersey-client:$jersey_version" compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1" compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
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_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
@ -126,7 +126,7 @@ dependencies {
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}} {{/java8}}
{{^java8}} {{^java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
compile "joda-time:joda-time:$jodatime_version" compile "joda-time:joda-time:$jodatime_version"
{{/java8}} {{/java8}}
compile "com.brsanthu:migbase64:2.2" compile "com.brsanthu:migbase64:2.2"

14
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
View File

@ -12,16 +12,16 @@ lazy val root = (project in file(".")).
"io.swagger" % "swagger-annotations" % "1.5.8", "io.swagger" % "swagger-annotations" % "1.5.8",
"org.glassfish.jersey.core" % "jersey-client" % "2.22.2", "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-multipart" % "2.22.2",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.1", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.0", "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0", "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5",
{{#java8}} {{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.0", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5",
{{/java8}} {{/java8}}
{{^java8}} {{^java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5",
"joda-time" % "joda-time" % "2.9.3", "joda-time" % "joda-time" % "2.9.4",
{{/java8}} {{/java8}}
"com.brsanthu" % "migbase64" % "2.2", "com.brsanthu" % "migbase64" % "2.2",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

12
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
View File

@ -52,7 +52,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -98,7 +98,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>2.5.1</version>
<configuration> <configuration>
{{#java8}} {{#java8}}
<source>1.8</source> <source>1.8</source>
@ -133,7 +133,7 @@
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>2.22.1</version> <version>${jersey-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
@ -163,7 +163,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>2.1.5</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
@ -190,9 +190,9 @@
<properties> <properties>
<swagger-core-version>1.5.8</swagger-core-version> <swagger-core-version>1.5.8</swagger-core-version>
<jersey-version>2.22.2</jersey-version> <jersey-version>2.22.2</jersey-version>
<jackson-version>2.7.0</jackson-version> <jackson-version>2.7.5</jackson-version>
{{^java8}} {{^java8}}
<jodatime-version>2.9.3</jodatime-version> <jodatime-version>2.9.4</jodatime-version>
{{/java8}} {{/java8}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

6
modules/swagger-codegen/src/main/resources/Java/pom.mustache
View File

@ -160,7 +160,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>2.1.5</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
@ -188,9 +188,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.8</swagger-annotations-version> <swagger-annotations-version>1.5.8</swagger-annotations-version>
<jersey-version>1.19.1</jersey-version> <jersey-version>1.19.1</jersey-version>
<jackson-version>2.7.0</jackson-version> <jackson-version>2.7.5</jackson-version>
{{^java8}} {{^java8}}
<jodatime-version>2.9.3</jodatime-version> <jodatime-version>2.9.4</jodatime-version>
{{/java8}} {{/java8}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>