Add travis.yml to test java6 option (#568)

Add travis.yml to test java6 option, update Java (Jersey2) dependencies

.gitignore

@@ -83,6 +83,9 @@ samples/client/petstore/scala/build/
 samples/client/petstore/java/resttemplate/hello.txt
 samples/client/petstore/java/retrofit2/hello.txt
 samples/client/petstore/java/feign/hello.txt
+samples/client/petstore/java/jersey2-java6/project/
+samples/client/petstore/java/jersey2-java8/project/
+samples/client/petstore/java/jersey2/project/
 
 #PHP
 samples/client/petstore/php/OpenAPIToolsClient-php/composer.lock

CI/.travis.yml.jdk6

@@ -0,0 +1,29 @@
+dist: trusty
+sudo: required
+language: java
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
+jdk: openjdk6
+
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.ivy2
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+
+install:
+   - jdk_switcher use openjdk6 
+   - java -version
+   - curl -s "https://get.sdkman.io" | bash
+   - source "$HOME/.sdkman/bin/sdkman-init.sh"
+   - sdk version
+   - sdk install gradle 2.9
+   - sdk list gradle
+   - sdk version
+   - gradle --version
+
+script:
+  - cd samples/client/petstore/java/jersey2-java6 && gradle test

CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle

@@ -0,0 +1,122 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'org.openapitools'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        jcenter {
+            url "http://jcenter.bintray.com/"
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter {
+        url "http://jcenter.bintray.com/"
+    }
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    sourceCompatibility = JavaVersion.VERSION_1_6
+    targetCompatibility = JavaVersion.VERSION_1_6
+
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = 'petstore-jersey2-java6'
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.20"
+    jackson_version = "2.9.6"
+    jersey_version = "2.6"
+    commons_io_version=2.5
+    commons_lang3_version=3.6
+    junit_version = "4.12"
+    threetenbp_version = "2.6.4"
+}
+
+dependencies {
+    compile "io.swagger:swagger-annotations:$swagger_annotations_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-json-jackson:$jersey_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-databind:$jackson_version"
+    compile "commons-io:commons-io:$commons_io_version"
+    compile "org.apache.commons:commons-lang3:$commons_lang3_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
+    compile "com.brsanthu:migbase64:2.2"
+    testCompile "junit:junit:$junit_version"
+}

appveyor.yml

@@ -18,6 +18,7 @@ install:
   - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
+  - cmd: java -version
   - cmd: dir/w
   - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"

bin/java-petstore-jersey2-java6.sh

@@ -32,4 +32,8 @@ ags="generate --artifact-id petstore-jersey2-java6 -i modules/openapi-generator/
 echo "Removing files and folders under samples/client/petstore/java/jersey2-java6/src/main"
 rm -rf samples/client/petstore/java/jersey2-java6/src/main
 find samples/client/petstore/java/jersey2-java6 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+
+echo "Restoring build.gradle ... "
+cp CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle samples/client/petstore/java/jersey2-java6/
+
 java $JAVA_OPTS -jar $executable $ags

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

@@ -117,17 +117,20 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.17"
+    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.6"
     {{#supportJava6}}
     jersey_version = "2.6"
     commons_io_version=2.5
     commons_lang3_version=3.6
     {{/supportJava6}}
     {{^supportJava6}}
-    jersey_version = "2.25.1"
+    jersey_version = "2.27"
     {{/supportJava6}}
     junit_version = "4.12"
+    {{#threetenbp}}
+    threetenbp_version = "2.6.4"
+    {{/threetenbp}}
 }
 
 dependencies {
@@ -139,17 +142,17 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     {{#joda}}
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version",
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     {{/joda}}
     {{#java8}}
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     {{/java8}}
     {{#supportJava6}}
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
     {{/supportJava6}}
     {{#threetenbp}}
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     {{/threetenbp}}
     {{^java8}}
     compile "com.brsanthu:migbase64:2.2"

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache

@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.17",
+      "io.swagger" % "swagger-annotations" % "1.5.20",
       "org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
       "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
-      "com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
       {{#joda}}
       "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile",
       {{/joda}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache

@@ -276,7 +276,7 @@
             <dependency>
                 <groupId>com.github.joschi.jackson</groupId>
                 <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-version}</version>
+                <version>${threetenbp-version}</version>
             </dependency>
         {{/threetenbp}}
         {{^java8}}
@@ -318,16 +318,19 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.20</swagger-core-version>
         {{^supportJava6}}
-            <jersey-version>2.25.1</jersey-version>
+        <jersey-version>2.27</jersey-version>
         {{/supportJava6}}
         {{#supportJava6}}
-            <jersey-version>2.6</jersey-version>
+        <jersey-version>2.6</jersey-version>
-            <commons_io_version>2.5</commons_io_version>
+        <commons_io_version>2.5</commons_io_version>
-            <commons_lang3_version>3.6</commons_lang3_version>
+        <commons_lang3_version>3.6</commons_lang3_version>
         {{/supportJava6}}
-        <jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
+        <jackson-version>2.8.9</jackson-version>
+        {{#threetenbp}}
+        <threetenbp-version>2.6.4</threetenbp-version>
+        {{/threetenbp}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

samples/client/petstore/java/jersey2-java6/build.gradle

@@ -6,7 +6,9 @@ version = '1.0.0'
 
 buildscript {
     repositories {
-        jcenter()
+        jcenter {
+            url "http://jcenter.bintray.com/"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +17,9 @@ buildscript {
 }
 
 repositories {
-    jcenter()
+    jcenter {
+        url "http://jcenter.bintray.com/"
+    }
 }
 
 
@@ -93,12 +97,13 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.17"
+    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.6"
     jersey_version = "2.6"
     commons_io_version=2.5
     commons_lang3_version=3.6
     junit_version = "4.12"
+    threetenbp_version = "2.6.4"
 }
 
 dependencies {
@@ -111,7 +116,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/jersey2-java6/build.sbt

@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.17",
+      "io.swagger" % "swagger-annotations" % "1.5.20",
       "org.glassfish.jersey.core" % "jersey-client" % "2.6",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
       "com.brsanthu" % "migbase64" % "2.2",
       "org.apache.commons" % "commons-lang3" % "3.6",

samples/client/petstore/java/jersey2-java6/pom.xml

@@ -239,7 +239,7 @@
             <dependency>
                 <groupId>com.github.joschi.jackson</groupId>
                 <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-version}</version>
+                <version>${threetenbp-version}</version>
             </dependency>
             <!-- Base64 encoding that works in both JVM and Android -->
             <dependency>
@@ -267,11 +267,12 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.20</swagger-core-version>
-            <jersey-version>2.6</jersey-version>
+        <jersey-version>2.6</jersey-version>
-            <commons_io_version>2.5</commons_io_version>
+        <commons_io_version>2.5</commons_io_version>
-            <commons_lang3_version>3.6</commons_lang3_version>
+        <commons_lang3_version>3.6</commons_lang3_version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.8.9</jackson-version>
+        <threetenbp-version>2.6.4</threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

samples/client/petstore/java/jersey2-java8/build.gradle

@@ -93,9 +93,9 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.17"
+    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.6"
-    jersey_version = "2.25.1"
+    jersey_version = "2.27"
     junit_version = "4.12"
 }
 
@@ -107,6 +107,6 @@ 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_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/jersey2-java8/build.sbt

@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.17",
+      "io.swagger" % "swagger-annotations" % "1.5.20",
       "org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",

samples/client/petstore/java/jersey2-java8/pom.xml

@@ -251,9 +251,9 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.20</swagger-core-version>
-            <jersey-version>2.25.1</jersey-version>
+        <jersey-version>2.27</jersey-version>
-        <jackson-version>2.7.5</jackson-version>
+        <jackson-version>2.8.9</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>

samples/client/petstore/java/jersey2/build.gradle

@@ -93,10 +93,11 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.17"
+    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.8.9"
+    jackson_version = "2.9.6"
-    jersey_version = "2.25.1"
+    jersey_version = "2.27"
     junit_version = "4.12"
+    threetenbp_version = "2.6.4"
 }
 
 dependencies {
@@ -107,7 +108,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_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/jersey2/build.sbt

@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.17",
+      "io.swagger" % "swagger-annotations" % "1.5.20",
       "org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
       "com.brsanthu" % "migbase64" % "2.2",
       "junit" % "junit" % "4.12" % "test",

samples/client/petstore/java/jersey2/pom.xml

@@ -239,7 +239,7 @@
             <dependency>
                 <groupId>com.github.joschi.jackson</groupId>
                 <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-version}</version>
+                <version>${threetenbp-version}</version>
             </dependency>
             <!-- Base64 encoding that works in both JVM and Android -->
             <dependency>
@@ -257,9 +257,10 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-core-version>1.5.18</swagger-core-version>
+        <swagger-core-version>1.5.20</swagger-core-version>
-            <jersey-version>2.25.1</jersey-version>
+        <jersey-version>2.27</jersey-version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.8.9</jackson-version>
+        <threetenbp-version>2.6.4</threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
     </properties>