valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-06 18:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update swagger annotation version in Java clients (#915)

Browse Source 
* update swagger annotation version in java client

* add java retrofit2 play 2.6 to java petstore all bin script

* remove empty line in pom.xml
This commit is contained in:
William Cheng 2018-08-29 16:43:41 +08:00 committed by GitHub
parent 8e1e05e86c
commit b8db2af4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 189 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/java-petstore-all.sh
View File

@ -13,6 +13,7 @@
./bin/java8-petstore-jersey2.sh ./bin/java8-petstore-jersey2.sh
./bin/java-petstore-retrofit2-play24.sh ./bin/java-petstore-retrofit2-play24.sh
./bin/java-petstore-retrofit2-play25.sh ./bin/java-petstore-retrofit2-play25.sh
./bin/java-petstore-retrofit2-play26.sh
./bin/java-petstore-jersey2-java6.sh ./bin/java-petstore-jersey2-java6.sh
./bin/java-petstore-resttemplate.sh ./bin/java-petstore-resttemplate.sh
./bin/java-petstore-resttemplate-withxml.sh ./bin/java-petstore-resttemplate-withxml.sh

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
View File

@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.9" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7" jackson_version = "2.8.7"
{{#threetenbp}} {{#threetenbp}}
threepane_version = "2.6.4" threepane_version = "2.6.4"

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.9" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile", "io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile", "io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile", "io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",

10
modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: Netflix Feign --> <!-- HTTP client: Netflix Feign -->
@ -294,7 +292,7 @@
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version> <java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<feign-version>9.4.0</feign-version> <feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-version> <feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
View File

@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9" jackson_version = "2.8.9"
google_api_client_version = "1.23.0" google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1" jersey_common_version = "2.25.1"

2
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.17", "io.swagger" % "swagger-annotations" % "1.5.21",
"com.google.api-client" % "google-api-client" % "1.23.0", "com.google.api-client" % "google-api-client" % "1.23.0",
"org.glassfish.jersey.core" % "jersey-common" % "2.25.1", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",

8
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -287,7 +285,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<google-api-client-version>1.23.0</google-api-client-version> <google-api-client-version>1.23.0</google-api-client-version>
<jersey-common-version>2.25.1</jersey-common-version> <jersey-common-version>2.25.1</jersey-common-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>

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

@ -117,7 +117,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.20" swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6" jackson_version = "2.9.6"
{{#supportJava6}} {{#supportJava6}}
jersey_version = "2.6" jersey_version = "2.6"

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

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.20", "io.swagger" % "swagger-annotations" % "1.5.21",
"org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}}, "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-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}}, "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},

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

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -212,7 +210,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
@ -318,7 +316,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.20</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
{{^supportJava6}} {{^supportJava6}}
<jersey-version>2.27</jersey-version> <jersey-version>2.27</jersey-version>
{{/supportJava6}} {{/supportJava6}}

2
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.21"
rest_assured_version = "3.1.0" rest_assured_version = "3.1.0"
junit_version = "4.12" junit_version = "4.12"
gson_version = "2.6.1" gson_version = "2.6.1"

2
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.15", "io.swagger" % "swagger-annotations" % "1.5.21",
"io.rest-assured" % "scala-support" % "3.1.0", "io.rest-assured" % "scala-support" % "3.1.0",
"com.google.code.gson" % "gson" % "2.6.1", "com.google.code.gson" % "gson" % "2.6.1",
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile", "io.gsonfire" % "gson-fire" % "1.8.2" % "compile",

10
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
View File

@ -113,8 +113,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -126,8 +125,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -199,7 +197,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.rest-assured</groupId> <groupId>io.rest-assured</groupId>
@ -245,7 +243,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.15</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<rest-assured.version>3.1.0</rest-assured.version> <rest-assured.version>3.1.0</rest-assured.version>
<gson-version>2.6.1</gson-version> <gson-version>2.6.1</gson-version>
<gson-fire-version>1.8.2</gson-fire-version> <gson-fire-version>1.8.2</gson-fire-version>

10
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
View File

@ -95,8 +95,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -108,8 +107,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -155,7 +153,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
<dependency> <dependency>
@ -259,7 +257,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<resteasy-version>3.1.3.Final</resteasy-version> <resteasy-version>3.1.3.Final</resteasy-version>
<jackson-version>2.8.6</jackson-version> <jackson-version>2.8.6</jackson-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.6.4</threetenbp-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
View File

@ -118,7 +118,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9" jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

8
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -290,7 +288,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>
{{#joda}} {{#joda}}

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
View File

@ -109,7 +109,7 @@ ext {
okhttp_version = "2.7.5" okhttp_version = "2.7.5"
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "1.9.0" retrofit_version = "1.9.0"
swagger_annotations_version = "1.5.8" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
jodatime_version = "2.9.3" jodatime_version = "2.9.3"
{{#threetenbp}} {{#threetenbp}}

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
View File

@ -11,7 +11,7 @@ lazy val root = (project in file(".")).
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile", "com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
"com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile", "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.8" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "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.3" % "compile",
{{#threetenbp}} {{#threetenbp}}

12
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -212,7 +210,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit</groupId> <groupId>com.squareup.retrofit</groupId>
@ -241,7 +239,6 @@
<version>${threetenbp-version}</version> <version>${threetenbp-version}</version>
</dependency> </dependency>
{{/threetenbp}} {{/threetenbp}}
{{#parcelableModel}} {{#parcelableModel}}
<!-- Needed for Parcelable support--> <!-- Needed for Parcelable support-->
<dependency> <dependency>
@ -251,7 +248,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
{{/parcelableModel}} {{/parcelableModel}}
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -262,7 +258,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>1.9.0</retrofit-version> <retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.7.5</okhttp-version> <okhttp-version>2.7.5</okhttp-version>
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
View File

@ -134,7 +134,7 @@ ext {
play_version = "2.6.7" play_version = "2.6.7"
{{/play26}} {{/play26}}
{{/usePlayWS}} {{/usePlayWS}}
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
{{#useRxJava}} {{#useRxJava}}
rx_java_version = "1.3.0" rx_java_version = "1.3.0"

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
View File

@ -44,7 +44,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile", "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
{{/useRxJava2}} {{/useRxJava2}}
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
{{#joda}} {{#joda}}
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",

17
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -262,7 +260,6 @@
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
{{/useRxJava2}} {{/useRxJava2}}
{{#usePlayWS}} {{#usePlayWS}}
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
@ -291,16 +288,13 @@
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
{{#withXml}} {{#withXml}}
<!-- XML processing: Jackson --> <!-- XML processing: Jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
{{/withXml}} {{/withXml}}
{{#play24}} {{#play24}}
<dependency> <dependency>
<groupId>com.typesafe.play</groupId> <groupId>com.typesafe.play</groupId>
@ -327,9 +321,7 @@
<version>1.1.0.Final</version> <version>1.1.0.Final</version>
</dependency> </dependency>
{{/play26}} {{/play26}}
{{/usePlayWS}} {{/usePlayWS}}
{{#parcelableModel}} {{#parcelableModel}}
<!-- Needed for Parcelable support--> <!-- Needed for Parcelable support-->
<dependency> <dependency>
@ -339,7 +331,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
{{/parcelableModel}} {{/parcelableModel}}
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -354,7 +345,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
{{#usePlayWS}} {{#usePlayWS}}
{{#play24}} {{#play24}}
<jackson-version>2.6.6</jackson-version> <jackson-version>2.6.6</jackson-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
View File

@ -26,7 +26,7 @@ task execute(type:JavaExec) {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
vertx_version = "3.4.2" vertx_version = "3.4.2"
junit_version = "4.12" junit_version = "4.12"

10
modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- Vertx --> <!-- Vertx -->
@ -271,7 +269,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx-version>3.4.2</vertx-version> <vertx-version>3.4.2</vertx-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version> <jackson-version>{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

8
modules/openapi-generator/src/main/resources/Java/pom.mustache
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -327,7 +325,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jersey-version>1.19.4</jersey-version> <jersey-version>1.19.4</jersey-version>
{{#supportJava6}} {{#supportJava6}}
<commons_io_version>2.5</commons_io_version> <commons_io_version>2.5</commons_io_version>

2
samples/client/petstore/java/feign/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.9" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7" jackson_version = "2.8.7"
threepane_version = "2.6.4" threepane_version = "2.6.4"
feign_version = "9.4.0" feign_version = "9.4.0"

2
samples/client/petstore/java/feign/build.sbt
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.9" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile", "io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile", "io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile", "io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",

10
samples/client/petstore/java/feign/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: Netflix Feign --> <!-- HTTP client: Netflix Feign -->
@ -268,7 +266,7 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<feign-version>9.4.0</feign-version> <feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-version> <feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>

2
samples/client/petstore/java/google-api-client/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9" jackson_version = "2.8.9"
google_api_client_version = "1.23.0" google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1" jersey_common_version = "2.25.1"

2
samples/client/petstore/java/google-api-client/build.sbt
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.17", "io.swagger" % "swagger-annotations" % "1.5.21",
"com.google.api-client" % "google-api-client" % "1.23.0", "com.google.api-client" % "google-api-client" % "1.23.0",
"org.glassfish.jersey.core" % "jersey-common" % "2.25.1", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",

8
samples/client/petstore/java/google-api-client/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -246,7 +244,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<google-api-client-version>1.23.0</google-api-client-version> <google-api-client-version>1.23.0</google-api-client-version>
<jersey-common-version>2.25.1</jersey-common-version> <jersey-common-version>2.25.1</jersey-common-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>

8
samples/client/petstore/java/jersey1/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -257,7 +255,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jersey-version>1.19.4</jersey-version> <jersey-version>1.19.4</jersey-version>
<jackson-version>2.6.4</jackson-version> <jackson-version>2.6.4</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

2
samples/client/petstore/java/jersey2-java6/build.sbt
View File

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

10
samples/client/petstore/java/jersey2-java6/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
@ -267,7 +265,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.20</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-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>

2
samples/client/petstore/java/jersey2-java8/build.gradle
View File

@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.20" swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6" jackson_version = "2.9.6"
jersey_version = "2.27" jersey_version = "2.27"
junit_version = "4.12" junit_version = "4.12"

2
samples/client/petstore/java/jersey2-java8/build.sbt
View File

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

10
samples/client/petstore/java/jersey2-java8/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
@ -251,7 +249,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.20</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jersey-version>2.27</jersey-version> <jersey-version>2.27</jersey-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

2
samples/client/petstore/java/jersey2/build.gradle
View File

@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.20" swagger_annotations_version = "1.5.21"
jackson_version = "2.9.6" jackson_version = "2.9.6"
jersey_version = "2.27" jersey_version = "2.27"
junit_version = "4.12" junit_version = "4.12"

2
samples/client/petstore/java/jersey2/build.sbt
View File

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

10
samples/client/petstore/java/jersey2/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
@ -257,7 +255,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.20</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jersey-version>2.27</jersey-version> <jersey-version>2.27</jersey-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.6.4</threetenbp-version>

2
samples/client/petstore/java/rest-assured/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.21"
rest_assured_version = "3.1.0" rest_assured_version = "3.1.0"
junit_version = "4.12" junit_version = "4.12"
gson_version = "2.6.1" gson_version = "2.6.1"

2
samples/client/petstore/java/rest-assured/build.sbt
View File

@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.15", "io.swagger" % "swagger-annotations" % "1.5.21",
"io.rest-assured" % "scala-support" % "3.1.0", "io.rest-assured" % "scala-support" % "3.1.0",
"com.google.code.gson" % "gson" % "2.6.1", "com.google.code.gson" % "gson" % "2.6.1",
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile", "io.gsonfire" % "gson-fire" % "1.8.2" % "compile",

10
samples/client/petstore/java/rest-assured/pom.xml
View File

@ -113,8 +113,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -126,8 +125,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -199,7 +197,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.rest-assured</groupId> <groupId>io.rest-assured</groupId>
@ -236,7 +234,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.15</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<rest-assured.version>3.1.0</rest-assured.version> <rest-assured.version>3.1.0</rest-assured.version>
<gson-version>2.6.1</gson-version> <gson-version>2.6.1</gson-version>
<gson-fire-version>1.8.2</gson-fire-version> <gson-fire-version>1.8.2</gson-fire-version>

10
samples/client/petstore/java/resteasy/pom.xml
View File

@ -95,8 +95,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -108,8 +107,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -143,7 +141,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
<dependency> <dependency>
@ -215,7 +213,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<resteasy-version>3.1.3.Final</resteasy-version> <resteasy-version>3.1.3.Final</resteasy-version>
<jackson-version>2.8.6</jackson-version> <jackson-version>2.8.6</jackson-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.6.4</threetenbp-version>

2
samples/client/petstore/java/resttemplate-withXml/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9" jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

8
samples/client/petstore/java/resttemplate-withXml/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -255,7 +253,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

2
samples/client/petstore/java/resttemplate/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9" jackson_version = "2.8.9"
spring_web_version = "4.3.9.RELEASE" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

8
samples/client/petstore/java/resttemplate/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -247,7 +245,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version> <jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

2
samples/client/petstore/java/retrofit/build.gradle
View File

@ -97,7 +97,7 @@ ext {
okhttp_version = "2.7.5" okhttp_version = "2.7.5"
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "1.9.0" retrofit_version = "1.9.0"
swagger_annotations_version = "1.5.8" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
jodatime_version = "2.9.3" jodatime_version = "2.9.3"
} }

2
samples/client/petstore/java/retrofit/build.sbt
View File

@ -11,7 +11,7 @@ lazy val root = (project in file(".")).
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile", "com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
"com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile", "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.8" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "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.3" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

12
samples/client/petstore/java/retrofit/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit</groupId> <groupId>com.squareup.retrofit</groupId>
@ -222,8 +220,6 @@
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>${jodatime-version}</version> <version>${jodatime-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -234,7 +230,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>1.9.0</retrofit-version> <retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.7.5</okhttp-version> <okhttp-version>2.7.5</okhttp-version>
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>

2
samples/client/petstore/java/retrofit2-play24/build.gradle
View File

@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
jackson_version = "2.6.6" jackson_version = "2.6.6"
play_version = "2.4.11" play_version = "2.4.11"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2-play24/build.sbt
View File

@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

15
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -224,7 +222,6 @@
<artifactId>gson-fire</artifactId> <artifactId>gson-fire</artifactId>
<version>${gson-fire-version}</version> <version>${gson-fire-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -251,15 +248,11 @@
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.play</groupId> <groupId>com.typesafe.play</groupId>
<artifactId>play-java-ws_2.11</artifactId> <artifactId>play-java-ws_2.11</artifactId>
<version>${play-version}</version> <version>${play-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -274,7 +267,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.6.6</jackson-version> <jackson-version>2.6.6</jackson-version>
<play-version>2.4.11</play-version> <play-version>2.4.11</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>

2
samples/client/petstore/java/retrofit2-play25/build.gradle
View File

@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
jackson_version = "2.7.8" jackson_version = "2.7.8"
play_version = "2.5.14" play_version = "2.5.14"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"

2
samples/client/petstore/java/retrofit2-play25/build.sbt
View File

@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",

15
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -229,7 +227,6 @@
<artifactId>threetenbp</artifactId> <artifactId>threetenbp</artifactId>
<version>${threetenbp-version}</version> <version>${threetenbp-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -256,15 +253,11 @@
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.play</groupId> <groupId>com.typesafe.play</groupId>
<artifactId>play-java-ws_2.11</artifactId> <artifactId>play-java-ws_2.11</artifactId>
<version>${play-version}</version> <version>${play-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -279,7 +272,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.7.8</jackson-version> <jackson-version>2.7.8</jackson-version>
<play-version>2.5.15</play-version> <play-version>2.5.15</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>

2
samples/client/petstore/java/retrofit2-play26/build.gradle
View File

@ -98,7 +98,7 @@ ext {
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
jackson_version = "2.8.10" jackson_version = "2.8.10"
play_version = "2.6.7" play_version = "2.6.7"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"

2
samples/client/petstore/java/retrofit2-play26/build.sbt
View File

@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.10" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",

15
samples/client/petstore/java/retrofit2-play26/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -229,7 +227,6 @@
<artifactId>threetenbp</artifactId> <artifactId>threetenbp</artifactId>
<version>${threetenbp-version}</version> <version>${threetenbp-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -256,7 +253,6 @@
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.play</groupId> <groupId>com.typesafe.play</groupId>
<artifactId>play-ahc-ws_2.12</artifactId> <artifactId>play-ahc-ws_2.12</artifactId>
@ -267,9 +263,6 @@
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>1.1.0.Final</version> <version>1.1.0.Final</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -284,7 +277,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.8.10</jackson-version> <jackson-version>2.8.10</jackson-version>
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>

2
samples/client/petstore/java/retrofit2/build.gradle
View File

@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"

2
samples/client/petstore/java/retrofit2/build.sbt
View File

@ -12,7 +12,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",

13
samples/client/petstore/java/retrofit2/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -229,9 +227,6 @@
<artifactId>threetenbp</artifactId> <artifactId>threetenbp</artifactId>
<version>${threetenbp-version}</version> <version>${threetenbp-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -246,7 +241,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

2
samples/client/petstore/java/retrofit2rx/build.gradle
View File

@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
rx_java_version = "1.3.0" rx_java_version = "1.3.0"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"

2
samples/client/petstore/java/retrofit2rx/build.sbt
View File

@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
"io.reactivex" % "rxjava" % "1.3.0" % "compile", "io.reactivex" % "rxjava" % "1.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",

13
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -239,9 +237,6 @@
<artifactId>adapter-rxjava</artifactId> <artifactId>adapter-rxjava</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -256,7 +251,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-version> <rxjava-version>1.3.0</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>

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

@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
junit_version = "4.12" junit_version = "4.12"
rx_java_version = "2.1.1" rx_java_version = "2.1.1"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"

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

@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile", "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.17" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",

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

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -191,7 +189,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>com.squareup.retrofit2</groupId>
@ -239,9 +237,6 @@
<artifactId>adapter-rxjava2</artifactId> <artifactId>adapter-rxjava2</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -256,7 +251,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>

2
samples/client/petstore/java/vertx/build.gradle
View File

@ -26,7 +26,7 @@ task execute(type:JavaExec) {
} }
ext { ext {
swagger_annotations_version = "1.5.17" swagger_annotations_version = "1.5.21"
jackson_version = "2.6.4" jackson_version = "2.6.4"
vertx_version = "3.4.2" vertx_version = "3.4.2"
junit_version = "4.12" junit_version = "4.12"

10
samples/client/petstore/java/vertx/pom.xml
View File

@ -114,8 +114,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/main/java</source>
src/main/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -127,8 +126,7 @@
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source> <source>src/test/java</source>
src/test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -200,7 +198,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- Vertx --> <!-- Vertx -->
@ -260,7 +258,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx-version>3.4.2</vertx-version> <vertx-version>3.4.2</vertx-version>
<swagger-core-version>1.5.18</swagger-core-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.6.4</jackson-version> <jackson-version>2.6.4</jackson-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>