From 996acc05f5d42c02e5369a07b9b0fffae7329998 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 28 Mar 2017 21:05:12 +0800 Subject: [PATCH] [Java][Retrofit2] update gradle, sbt build file with latest dependencies (#5238) * update build.gradle for retrofit2 * update retrofit2 rx2 sample * update gradle and sbt build file for retrofit2 --- bin/java-petstore-retrofit2-all.sh | 6 ++++ .../libraries/retrofit2/build.gradle.mustache | 24 +++++++++++---- .../libraries/retrofit2/build.sbt.mustache | 30 +++++++++++++------ .../java/retrofit2-play24/build.gradle | 13 ++++++-- .../petstore/java/retrofit2-play24/build.sbt | 17 +++++++---- .../java/retrofit2-play24/docs/FakeApi.md | 2 +- .../java/retrofit2-play24/docs/PetApi.md | 2 +- .../java/retrofit2-play24/docs/StoreApi.md | 2 +- .../java/retrofit2-play24/docs/UserApi.md | 2 +- .../java/io/swagger/client/ApiClient.java | 2 +- .../petstore/java/retrofit2/build.gradle | 6 ++-- .../client/petstore/java/retrofit2/build.sbt | 12 ++++---- .../petstore/java/retrofit2/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2/docs/PetApi.md | 2 +- .../petstore/java/retrofit2/docs/StoreApi.md | 2 +- .../petstore/java/retrofit2/docs/UserApi.md | 2 +- .../java/io/swagger/client/ApiClient.java | 2 +- .../petstore/java/retrofit2rx/build.gradle | 8 ++--- .../petstore/java/retrofit2rx/build.sbt | 16 +++++----- .../petstore/java/retrofit2rx/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2rx/docs/PetApi.md | 2 +- .../java/retrofit2rx/docs/StoreApi.md | 2 +- .../petstore/java/retrofit2rx/docs/UserApi.md | 2 +- .../java/io/swagger/client/ApiClient.java | 2 +- .../petstore/java/retrofit2rx2/build.gradle | 8 ++--- .../petstore/java/retrofit2rx2/build.sbt | 16 +++++----- .../java/retrofit2rx2/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2rx2/docs/PetApi.md | 2 +- .../java/retrofit2rx2/docs/StoreApi.md | 2 +- .../java/retrofit2rx2/docs/UserApi.md | 2 +- .../java/io/swagger/client/ApiClient.java | 2 +- 31 files changed, 120 insertions(+), 76 deletions(-) create mode 100755 bin/java-petstore-retrofit2-all.sh diff --git a/bin/java-petstore-retrofit2-all.sh b/bin/java-petstore-retrofit2-all.sh new file mode 100755 index 000000000000..607a1116aaeb --- /dev/null +++ b/bin/java-petstore-retrofit2-all.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +./bin/java-petstore-retrofit2-play24.sh +./bin/java-petstore-retrofit2.sh +./bin/java-petstore-retrofit2rx.sh +./bin/java-petstore-retrofit2rx2.sh diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 407c7ab6b02b..911a9b137c98 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/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}} {{^java8}} - jodatime_version = "2.9.3" + jodatime_version = "2.9.4" {{/java8}} } @@ -126,6 +133,13 @@ dependencies { {{^java8}} compile "joda-time:joda-time:$jodatime_version" {{/java8}} + {{#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" } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index f7aa59964095..e5c7f5af2211 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -9,23 +9,35 @@ 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", {{^java8}} - "joda-time" % "joda-time" % "2.9.3" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", {{/java8}} "junit" % "junit" % "4.12" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index f82ab3d19e1c..e56eb9bd23f4 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -95,10 +95,12 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" - retrofit_version = "2.0.2" - swagger_annotations_version = "1.5.8" + retrofit_version = "2.1.0" + jackson_version = "2.7.5" + play_version = "2.4.11" + swagger_annotations_version = "1.5.12" junit_version = "4.12" - jodatime_version = "2.9.3" + jodatime_version = "2.9.4" } dependencies { @@ -108,6 +110,11 @@ dependencies { 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" + 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-joda:$jackson_version" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt index 044dec41851d..feceac08cf17 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.sbt +++ b/samples/client/petstore/java/retrofit2-play24/build.sbt @@ -9,13 +9,18 @@ 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", - "io.swagger" % "swagger-annotations" % "1.5.8" % "compile", + "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", + "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.3" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", "junit" % "junit" % "4.12" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md index 3565773358ea..b1cef72e11f5 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md @@ -1,6 +1,6 @@ # FakeApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md index 211f5be5fa85..ea3c05ad4120 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md @@ -1,6 +1,6 @@ # PetApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md b/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md index 30e3c11d440c..509e8c9147b9 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md @@ -1,6 +1,6 @@ # StoreApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2-play24/docs/UserApi.md b/samples/client/petstore/java/retrofit2-play24/docs/UserApi.md index b0a0149a50af..40096ec05bc6 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/UserApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/UserApi.md @@ -1,6 +1,6 @@ # UserApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java index 4abefe6b8904..5d53666a6caf 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java @@ -31,7 +31,7 @@ public class ApiClient { private Map authentications; /** API base path */ - private String basePath = "http://petstore.swagger.io/v2"; + private String basePath = "http://petstore.swagger.io:80/v2"; public ApiClient(WSClient wsClient) { this(); diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle index 4287ae6e53f8..e65760134e7a 100644 --- a/samples/client/petstore/java/retrofit2/build.gradle +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -95,10 +95,10 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" - retrofit_version = "2.0.2" - swagger_annotations_version = "1.5.8" + retrofit_version = "2.2.0" + swagger_annotations_version = "1.5.12" junit_version = "4.12" - jodatime_version = "2.9.3" + jodatime_version = "2.9.4" } dependencies { diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt index c42d32f7b538..dc9ee6dee8fd 100644 --- a/samples/client/petstore/java/retrofit2/build.sbt +++ b/samples/client/petstore/java/retrofit2/build.sbt @@ -9,13 +9,13 @@ 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", - "io.swagger" % "swagger-annotations" % "1.5.8" % "compile", + "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", + "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.3" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", "junit" % "junit" % "4.12" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md index 3565773358ea..b1cef72e11f5 100644 --- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md @@ -1,6 +1,6 @@ # FakeApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2/docs/PetApi.md b/samples/client/petstore/java/retrofit2/docs/PetApi.md index 211f5be5fa85..ea3c05ad4120 100644 --- a/samples/client/petstore/java/retrofit2/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2/docs/PetApi.md @@ -1,6 +1,6 @@ # PetApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2/docs/StoreApi.md index 30e3c11d440c..509e8c9147b9 100644 --- a/samples/client/petstore/java/retrofit2/docs/StoreApi.md +++ b/samples/client/petstore/java/retrofit2/docs/StoreApi.md @@ -1,6 +1,6 @@ # StoreApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2/docs/UserApi.md b/samples/client/petstore/java/retrofit2/docs/UserApi.md index b0a0149a50af..40096ec05bc6 100644 --- a/samples/client/petstore/java/retrofit2/docs/UserApi.md +++ b/samples/client/petstore/java/retrofit2/docs/UserApi.md @@ -1,6 +1,6 @@ # UserApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java index b31065501713..42227449ea81 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java @@ -118,7 +118,7 @@ public class ApiClient { okBuilder = new OkHttpClient.Builder(); - String baseUrl = "http://petstore.swagger.io/v2"; + String baseUrl = "http://petstore.swagger.io:80/v2"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/"; diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle index 8d9fa82e69a5..d6e6387b2bb8 100644 --- a/samples/client/petstore/java/retrofit2rx/build.gradle +++ b/samples/client/petstore/java/retrofit2rx/build.gradle @@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" - retrofit_version = "2.0.2" - swagger_annotations_version = "1.5.8" + retrofit_version = "2.2.0" + swagger_annotations_version = "1.5.12" junit_version = "4.12" - rx_java_version = "1.1.3" - jodatime_version = "2.9.3" + rx_java_version = "1.2.9" + jodatime_version = "2.9.4" } dependencies { diff --git a/samples/client/petstore/java/retrofit2rx/build.sbt b/samples/client/petstore/java/retrofit2rx/build.sbt index 3e999d082e03..30e122bb085a 100644 --- a/samples/client/petstore/java/retrofit2rx/build.sbt +++ b/samples/client/petstore/java/retrofit2rx/build.sbt @@ -9,15 +9,15 @@ 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", - "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile", - "io.reactivex" % "rxjava" % "1.1.3" % "compile", - "io.swagger" % "swagger-annotations" % "1.5.8" % "compile", + "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", + "com.squareup.retrofit2" % "adapter-rxjava" % "2.2.0" % "compile", + "io.reactivex" % "rxjava" % "1.2.9" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.3" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", "junit" % "junit" % "4.12" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md index 3565773358ea..b1cef72e11f5 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md @@ -1,6 +1,6 @@ # FakeApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md index 211f5be5fa85..ea3c05ad4120 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md @@ -1,6 +1,6 @@ # PetApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md index 30e3c11d440c..509e8c9147b9 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md @@ -1,6 +1,6 @@ # StoreApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx/docs/UserApi.md index b0a0149a50af..40096ec05bc6 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/UserApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/UserApi.md @@ -1,6 +1,6 @@ # UserApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java index 4001ccb7035b..272d118db65c 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java @@ -119,7 +119,7 @@ public class ApiClient { okBuilder = new OkHttpClient.Builder(); - String baseUrl = "http://petstore.swagger.io/v2"; + String baseUrl = "http://petstore.swagger.io:80/v2"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/"; diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle index a93120f1674c..517e6ec99277 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.gradle +++ b/samples/client/petstore/java/retrofit2rx2/build.gradle @@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" - retrofit_version = "2.0.2" - swagger_annotations_version = "1.5.8" + retrofit_version = "2.2.0" + swagger_annotations_version = "1.5.12" junit_version = "4.12" - rx_java_version = "1.1.3" - jodatime_version = "2.9.3" + rx_java_version = "1.2.9" + jodatime_version = "2.9.4" } dependencies { diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt index 96a5e668cb9e..61a5f5363e63 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.sbt +++ b/samples/client/petstore/java/retrofit2rx2/build.sbt @@ -9,15 +9,15 @@ 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", - "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile", - "io.reactivex" % "rxjava" % "1.1.3" % "compile", - "io.swagger" % "swagger-annotations" % "1.5.8" % "compile", + "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", + "com.squareup.retrofit2" % "adapter-rxjava" % "2.2.0" % "compile", + "io.reactivex" % "rxjava" % "1.2.9" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.3" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", "junit" % "junit" % "4.12" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test" ) ) diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md index 3565773358ea..b1cef72e11f5 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md @@ -1,6 +1,6 @@ # FakeApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md index 211f5be5fa85..ea3c05ad4120 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md @@ -1,6 +1,6 @@ # PetApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md index 30e3c11d440c..509e8c9147b9 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md @@ -1,6 +1,6 @@ # StoreApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md index b0a0149a50af..40096ec05bc6 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md @@ -1,6 +1,6 @@ # UserApi -All URIs are relative to *http://petstore.swagger.io/v2* +All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java index 4001ccb7035b..272d118db65c 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java @@ -119,7 +119,7 @@ public class ApiClient { okBuilder = new OkHttpClient.Builder(); - String baseUrl = "http://petstore.swagger.io/v2"; + String baseUrl = "http://petstore.swagger.io:80/v2"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/";