Merge remote-tracking branch 'origin/master' into 2.3.0

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

@@ -95,17 +95,24 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     oltu_version = "1.0.1"
-    retrofit_version = "2.0.2"
-    swagger_annotations_version = "1.5.8"
+    {{^usePlay24WS}}
+    retrofit_version = "2.2.0"
+    {{/usePlay24WS}}
+    {{#usePlay24WS}}
+    retrofit_version = "2.1.0"
+    jackson_version = "2.7.5"
+    play_version = "2.4.11"
+    {{/usePlay24WS}}
+    swagger_annotations_version = "1.5.12"
     junit_version = "4.12"
     {{#useRxJava}}
-    rx_java_version = "1.1.3"
+    rx_java_version = "1.2.9"
     {{/useRxJava}}
     {{#useRxJava2}}
-    rx_java_version = "2.0.5"
+    rx_java_version = "2.0.7"
     {{/useRxJava2}}
     {{#joda}}
-    jodatime_version = "2.9.3"
+    jodatime_version = "2.9.4"
     {{/joda}}
     {{#threetenbp}}
     threetenbp_version = "1.3.2"
@@ -132,6 +139,13 @@ dependencies {
     {{#threetenbp}}
     compile 'org.threeten:threetenbp:$threetenbp_version'
     {{/threetenbp}}
+    {{#usePlay24WS}}
+    compile "com.typesafe.play:play-java-ws_2.11:$play_version"
+    compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version"
+    {{/usePlay24WS}}
 
     testCompile "junit:junit:$junit_version"
 }

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

@@ -9,26 +9,38 @@ lazy val root = (project in file(".")).
     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",
+      {{^usePlay24WS}}
+      "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
+      {{/usePlay24WS}}
+      {{#usePlay24WS}}
+      "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
+      "com.squareup.retrofit2" % "retrofit" % "2.1.0" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.1.0" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.1.0" % "compile",
+      "com.squareup.retrofit2" % "converter-jackson" % "2.1.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
+      {{/usePlay24WS}}
       {{#useRxJava}}
-      "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
-      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava" % "{{^usePlay24WS}}2.2.0{{/usePlay24WS}}{{#usePlay24WS}}2.1.0{{/usePlay24WS}}" % "compile",
+      "io.reactivex" % "rxjava" % "1.2.9" % "compile",
       {{/useRxJava}}
       {{#useRxJava2}}
       "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
-      "io.reactivex.rxjava2" % "rxjava" % "2.0.5" % "compile",
+      "io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile",
       {{/useRxJava2}}
-      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       {{#joda}}
-      "joda-time" % "joda-time" % "2.9.3" % "compile",
+      "joda-time" % "joda-time" % "2.9.4" % "compile",
       {{/joda}}
       {{#threetenbp}}
       "org.threeten" % "threetenbp" % "1.3.2" % "compile",
       {{/threetenbp}}
       "junit" % "junit" % "4.12" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
+      "com.novocode" % "junit-interface" % "0.11" % "test"
     )
   )

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

@@ -262,8 +262,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}}
 
@@ -281,15 +281,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}}
     {{#joda}}
     <jodatime-version>2.9.3</jodatime-version>