[Java][Retrofit2] update retrofit2 dependencies

bin/java-petstore-retrofit2rx2.json

@@ -0,0 +1,4 @@
+{
+  "library": "retrofit2",
+  "artifactId": "swagger-petstore-retrofit2-rx2"
+}

bin/java-petstore-retrofit2rx2.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx2.json -o samples/client/petstore/java/retrofit2rx2 -DuseRxJava=true,hideGenerationTimestamp=true"
+
+echo "Removing files and folders under samples/client/petstore/java/retrofit2rx2/src/main"
+rm -rf samples/client/petstore/java/retrofit2rx2/src/main
+find samples/client/petstore/java/retrofit2rx2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -255,8 +255,8 @@
     </dependency>
     <dependency>
         <groupId>com.typesafe.play</groupId>
-        <artifactId>play-java-ws_2.10</artifactId>
-        <version>2.4.6</version>
+        <artifactId>play-java-ws_2.11</artifactId>
+        <version>${play-version}</version>
     </dependency>
     {{/usePlay24WS}}
 
@@ -274,15 +274,19 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.12</swagger-core-version>
-    <retrofit-version>2.1.0</retrofit-version>
     {{#usePlay24WS}}
+    <retrofit-version>2.1.0</retrofit-version>
     <jackson-version>2.7.5</jackson-version>
+    <play-version>2.4.11</play-version>
+    {{/usePlay24WS}}
+    {{^usePlay24WS}}
+    <retrofit-version>2.2.0</retrofit-version>
     {{/usePlay24WS}}
     {{#useRxJava}}
-    <rxjava-version>1.1.6</rxjava-version>
+    <rxjava-version>1.2.9</rxjava-version>
     {{/useRxJava}}
     {{#useRxJava2}}
-    <rxjava-version>2.0.5</rxjava-version>
+    <rxjava-version>2.0.7</rxjava-version>
     {{/useRxJava2}}
     {{^java8}}
     <jodatime-version>2.9.4</jodatime-version>

samples/client/petstore/java/retrofit2-play24/pom.xml

@@ -228,8 +228,8 @@
     </dependency>
     <dependency>
         <groupId>com.typesafe.play</groupId>
-        <artifactId>play-java-ws_2.10</artifactId>
-        <version>2.4.6</version>
+        <artifactId>play-java-ws_2.11</artifactId>
+        <version>${play-version}</version>
     </dependency>
 
     <!-- test dependencies -->
@@ -248,6 +248,7 @@
     <swagger-core-version>1.5.12</swagger-core-version>
     <retrofit-version>2.1.0</retrofit-version>
     <jackson-version>2.7.5</jackson-version>
+    <play-version>2.4.11</play-version>
     <jodatime-version>2.9.4</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>

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

@@ -215,7 +215,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.12</swagger-core-version>
-    <retrofit-version>2.1.0</retrofit-version>
+    <retrofit-version>2.2.0</retrofit-version>
     <jodatime-version>2.9.4</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>

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

@@ -225,8 +225,8 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.12</swagger-core-version>
-    <retrofit-version>2.1.0</retrofit-version>
-    <rxjava-version>1.1.6</rxjava-version>
+    <retrofit-version>2.2.0</retrofit-version>
+    <rxjava-version>1.2.9</rxjava-version>
     <jodatime-version>2.9.4</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>

samples/client/petstore/java/retrofit2rx2/.gitignore

@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build

samples/client/petstore/java/retrofit2rx2/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/java/retrofit2rx2/.travis.yml

@@ -0,0 +1,17 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test

samples/client/petstore/java/retrofit2rx2/README.md

@@ -0,0 +1,39 @@
+# swagger-petstore-retrofit2-rx2
+
+## Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation & Usage
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+
+```xml
+<dependency>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-petstore-retrofit2-rx2</artifactId>
+    <version>1.0.0</version>
+    <scope>compile</scope>
+</dependency>
+
+```
+
+## Author
+
+apiteam@swagger.io
+
+

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

@@ -0,0 +1,116 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'io.swagger'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+	apply plugin: 'com.android.library'
+	apply plugin: 'com.github.dcendents.android-maven'
+
+	android {
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
+	    defaultConfig {
+	        minSdkVersion 14
+	        targetSdkVersion 23
+	    }
+	    compileOptions {
+	        sourceCompatibility JavaVersion.VERSION_1_7
+	        targetCompatibility JavaVersion.VERSION_1_7
+	    }
+
+	    // 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_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
+	install {
+	    repositories.mavenInstaller {
+	        pom.artifactId = 'swagger-petstore-retrofit2-rx2'
+	    }
+	}
+
+	task execute(type:JavaExec) {
+	   main = System.getProperty('mainClass')
+	   classpath = sourceSets.main.runtimeClasspath
+	}
+}
+
+ext {
+    oltu_version = "1.0.1"
+    retrofit_version = "2.0.2"
+    swagger_annotations_version = "1.5.8"
+    junit_version = "4.12"
+    rx_java_version = "1.1.3"
+    jodatime_version = "2.9.3"
+}
+
+dependencies {
+    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    compile "io.reactivex:rxjava:$rx_java_version"
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
+
+    testCompile "junit:junit:$junit_version"
+}

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

@@ -0,0 +1,23 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-retrofit2-rx2",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
+      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )

samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md

@@ -0,0 +1,11 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map<String, String>** |  |  [optional]
+**mapOfMapProperty** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
+
+
+

samples/client/petstore/java/retrofit2rx2/docs/Animal.md

@@ -0,0 +1,11 @@
+
+# Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/retrofit2rx2/docs/AnimalFarm.md

@@ -0,0 +1,9 @@
+
+# AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+