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

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

Browse Source
This commit is contained in:
wing328
2017-06-26 23:39:04 +08:00
parent 4d065e8823 522d704f7a
commit 49dbb51957
60 changed files with 182 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/client/petstore/java/retrofit2rx2/build.gradle
View File

@@ -96,9 +96,9 @@ if(hasProperty('target') && target == 'android') {
ext {
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.13"
swagger_annotations_version = "1.5.15"
junit_version = "4.12"
rx_java_version = "2.1.0"
rx_java_version = "2.1.1"
threetenbp_version = "1.3.5"
}

8
samples/client/petstore/java/retrofit2rx2/build.sbt
View File

@@ -10,11 +10,11 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.15" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
"junit" % "junit" % "4.12" % "test",

4
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@@ -225,9 +225,9 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.13</swagger-core-version>
<swagger-core-version>1.5.15</swagger-core-version>
<retrofit-version>2.3.0</retrofit-version>
<rxjava-version>2.1.0</rxjava-version>
<rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>