update swagger annoatation version to 1.5.17 (#7500)

This commit is contained in:
William Cheng 2018-01-25 23:29:20 +08:00 committed by GitHub
parent df10c725ab
commit 2394fac677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
114 changed files with 1375 additions and 1555 deletions

View File

@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
jersey_version = "1.19.4" jersey_version = "1.19.4"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

View File

@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

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.17",
"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",

View File

@ -283,7 +283,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.15</swagger-annotations-version> <swagger-annotations-version>1.5.17</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>

View File

@ -105,7 +105,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "2.8.9" jackson_version = "2.8.9"
{{#supportJava6}} {{#supportJava6}}
jersey_version = "2.6" jersey_version = "2.6"

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.17",
"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}},

View File

@ -100,7 +100,7 @@ if(hasProperty('target') && target == 'android') {
} }
dependencies { dependencies {
compile 'io.swagger:swagger-annotations:1.5.15' compile 'io.swagger:swagger-annotations:1.5.17'
compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.8.1' compile 'com.google.code.gson:gson:2.8.1'

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.17",
"com.squareup.okhttp" % "okhttp" % "2.7.5", "com.squareup.okhttp" % "okhttp" % "2.7.5",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5", "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
"com.google.code.gson" % "gson" % "2.8.1", "com.google.code.gson" % "gson" % "2.8.1",

View File

@ -106,7 +106,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

View File

@ -286,14 +286,14 @@
</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.15</swagger-annotations-version> <swagger-annotations-version>1.5.17</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}}
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

View File

@ -112,7 +112,7 @@ ext {
play_version = "2.5.14" play_version = "2.5.14"
{{/play25}} {{/play25}}
{{/usePlayWS}} {{/usePlayWS}}
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
junit_version = "4.12" junit_version = "4.12"
{{#useRxJava}} {{#useRxJava}}
rx_java_version = "1.3.0" rx_java_version = "1.3.0"

View File

@ -37,7 +37,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.15" % "compile", "io.swagger" % "swagger-annotations" % "1.5.17" % "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",

View File

@ -26,7 +26,7 @@ task execute(type:JavaExec) {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

View File

@ -323,11 +323,11 @@
</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.15</swagger-annotations-version> <swagger-annotations-version>1.5.17</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>
<commons_lang3_version>3.6</commons_lang3_version> <commons_lang3_version>3.6</commons_lang3_version>
{{/supportJava6}} {{/supportJava6}}
<jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version> <jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -37,7 +37,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("DELETE /pet/{petId}") @RequestLine("DELETE /pet/{petId}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
"api_key: {apiKey}" "api_key: {apiKey}"
}) })
@ -51,7 +50,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("GET /pet/findByStatus?status={status}") @RequestLine("GET /pet/findByStatus?status={status}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
List<Pet> findPetsByStatus(@Param("status") List<String> status); List<Pet> findPetsByStatus(@Param("status") List<String> status);
@ -73,7 +71,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("GET /pet/findByStatus?status={status}") @RequestLine("GET /pet/findByStatus?status={status}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams); List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
@ -97,7 +94,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("GET /pet/findByTags?tags={tags}") @RequestLine("GET /pet/findByTags?tags={tags}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
List<Pet> findPetsByTags(@Param("tags") List<String> tags); List<Pet> findPetsByTags(@Param("tags") List<String> tags);
@ -119,7 +115,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("GET /pet/findByTags?tags={tags}") @RequestLine("GET /pet/findByTags?tags={tags}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
List<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams); List<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
@ -143,7 +138,6 @@ public interface PetApi extends ApiClient.Api {
*/ */
@RequestLine("GET /pet/{petId}") @RequestLine("GET /pet/{petId}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
Pet getPetById(@Param("petId") Long petId); Pet getPetById(@Param("petId") Long petId);

View File

@ -22,7 +22,6 @@ public interface StoreApi extends ApiClient.Api {
*/ */
@RequestLine("DELETE /store/order/{orderId}") @RequestLine("DELETE /store/order/{orderId}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
void deleteOrder(@Param("orderId") String orderId); void deleteOrder(@Param("orderId") String orderId);
@ -34,7 +33,6 @@ public interface StoreApi extends ApiClient.Api {
*/ */
@RequestLine("GET /store/inventory") @RequestLine("GET /store/inventory")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
Map<String, Integer> getInventory(); Map<String, Integer> getInventory();
@ -47,7 +45,6 @@ public interface StoreApi extends ApiClient.Api {
*/ */
@RequestLine("GET /store/order/{orderId}") @RequestLine("GET /store/order/{orderId}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
Order getOrderById(@Param("orderId") Long orderId); Order getOrderById(@Param("orderId") Long orderId);

View File

@ -58,7 +58,6 @@ public interface UserApi extends ApiClient.Api {
*/ */
@RequestLine("DELETE /user/{username}") @RequestLine("DELETE /user/{username}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
void deleteUser(@Param("username") String username); void deleteUser(@Param("username") String username);
@ -71,7 +70,6 @@ public interface UserApi extends ApiClient.Api {
*/ */
@RequestLine("GET /user/{username}") @RequestLine("GET /user/{username}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
User getUserByName(@Param("username") String username); User getUserByName(@Param("username") String username);
@ -85,7 +83,6 @@ public interface UserApi extends ApiClient.Api {
*/ */
@RequestLine("GET /user/login?username={username}&password={password}") @RequestLine("GET /user/login?username={username}&password={password}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
String loginUser(@Param("username") String username, @Param("password") String password); String loginUser(@Param("username") String username, @Param("password") String password);
@ -108,7 +105,6 @@ public interface UserApi extends ApiClient.Api {
*/ */
@RequestLine("GET /user/login?username={username}&password={password}") @RequestLine("GET /user/login?username={username}&password={password}")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams); String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams);
@ -134,7 +130,6 @@ public interface UserApi extends ApiClient.Api {
*/ */
@RequestLine("GET /user/logout") @RequestLine("GET /user/logout")
@Headers({ @Headers({
"Content-Type: application/json",
"Accept: application/json", "Accept: application/json",
}) })
void logoutUser(); void logoutUser();

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

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.17",
"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",

View File

@ -247,7 +247,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.15</swagger-annotations-version> <swagger-annotations-version>1.5.17</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>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "2.6.4" jackson_version = "2.6.4"
jersey_version = "1.19.4" jersey_version = "1.19.4"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

View File

@ -258,7 +258,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.15</swagger-annotations-version> <swagger-annotations-version>1.5.17</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>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "2.8.9" jackson_version = "2.8.9"
jersey_version = "2.6" jersey_version = "2.6"
commons_io_version=2.5 commons_io_version=2.5

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.17",
"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",

View File

@ -1,88 +1,106 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-jersey2-java6</artifactId> <artifactId>swagger-petstore-jersey2-java6</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-jersey2-java6</name> <name>swagger-petstore-jersey2-java6</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>2.12</version> <version>3.0.0-M1</version>
<configuration> <executions>
<systemProperties> <execution>
<property> <id>enforce-maven</id>
<name>loggerPath</name> <goals>
<value>conf/log4j.properties</value> <goal>enforce</goal>
</property> </goals>
</systemProperties> <configuration>
<argLine>-Xms512m -Xmx1500m</argLine> <rules>
<parallel>methods</parallel> <requireMavenVersion>
<forkMode>pertest</forkMode> <version>2.2.0</version>
</configuration> </requireMavenVersion>
</plugin> </rules>
<plugin> </configuration>
<artifactId>maven-dependency-plugin</artifactId> </execution>
<executions> </executions>
<execution> </plugin>
<phase>package</phase> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>copy-dependencies</goal> <artifactId>maven-surefire-plugin</artifactId>
</goals> <version>2.12</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <systemProperties>
</configuration> <property>
</execution> <name>loggerPath</name>
</executions> <value>conf/log4j.properties</value>
</plugin> </property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
@ -155,106 +173,107 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>sign</goal> <goal>sign</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<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-core-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
<dependency> <dependency>
<groupId>org.glassfish.jersey.core</groupId> <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.joschi.jackson</groupId> <groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId> <artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<!-- Base64 encoding that works in both JVM and Android --> <!-- Base64 encoding that works in both JVM and Android -->
<dependency> <dependency>
<groupId>com.brsanthu</groupId> <groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId> <artifactId>migbase64</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${commons_lang3_version}</version> <version>${commons_lang3_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons_io_version}</version> <version>${commons_io_version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-core-version>1.5.18</swagger-core-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>2.6</jersey-version> <swagger-core-version>1.5.18</swagger-core-version>
<commons_io_version>2.5</commons_io_version> <jersey-version>2.6</jersey-version>
<commons_lang3_version>3.6</commons_lang3_version> <commons_io_version>2.5</commons_io_version>
<jackson-version>2.6.4</jackson-version> <commons_lang3_version>3.6</commons_lang3_version>
<maven-plugin-version>1.0.0</maven-plugin-version> <jackson-version>2.6.4</jackson-version>
<junit-version>4.12</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version>
</properties> <junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -761,7 +761,7 @@ public class ApiClient {
clientConfig.register(JacksonFeature.class); clientConfig.register(JacksonFeature.class);
clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true); clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
if (debugging) { if (debugging) {
clientConfig.register(new LoggingFilter(java.util.logging.Logger.getLogger(LoggingFilter.class.getName()), true)); clientConfig.register(new LoggingFilter(java.util.logging.Logger.getLogger(LoggingFilter.class.getName()), true));
} }
performAdditionalClientConfiguration(clientConfig); performAdditionalClientConfiguration(clientConfig);
return ClientBuilder.newClient(clientConfig); return ClientBuilder.newClient(clientConfig);

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "2.8.9" jackson_version = "2.8.9"
jersey_version = "2.25.1" jersey_version = "2.25.1"
junit_version = "4.12" junit_version = "4.12"

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.17",
"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",

View File

@ -1,88 +1,105 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-jersey2</artifactId> <artifactId>swagger-petstore-jersey2</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-jersey2</name> <name>swagger-petstore-jersey2</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>2.12</version> <version>3.0.0-M1</version>
<configuration> <executions>
<systemProperties> <execution>
<property> <id>enforce-maven</id>
<name>loggerPath</name> <goals>
<value>conf/log4j.properties</value> <goal>enforce</goal>
</property> </goals>
</systemProperties> <configuration>
<argLine>-Xms512m -Xmx1500m</argLine> <rules>
<parallel>methods</parallel> <requireMavenVersion>
<forkMode>pertest</forkMode> <version>2.2.0</version>
</configuration> </requireMavenVersion>
</plugin> </rules>
<plugin> </configuration>
<artifactId>maven-dependency-plugin</artifactId> </execution>
<executions> </executions>
<execution> </plugin>
<phase>package</phase> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>copy-dependencies</goal> <artifactId>maven-surefire-plugin</artifactId>
</goals> <version>2.12</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <systemProperties>
</configuration> <property>
</execution> <name>loggerPath</name>
</executions> <value>conf/log4j.properties</value>
</plugin> </property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar --> <!-- attach test jar -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
<goal>test-jar</goal> <goal>test-jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -156,88 +173,89 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>sign</goal> <goal>sign</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<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-core-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
<dependency> <dependency>
<groupId>org.glassfish.jersey.core</groupId> <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-core-version>1.5.18</swagger-core-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>2.25.1</jersey-version> <swagger-core-version>1.5.18</swagger-core-version>
<jackson-version>2.7.5</jackson-version> <jersey-version>2.25.1</jersey-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <jackson-version>2.7.5</jackson-version>
<junit-version>4.12</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version>
</properties> <junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
jackson_version = "2.8.9" jackson_version = "2.8.9"
jersey_version = "2.25.1" jersey_version = "2.25.1"
junit_version = "4.12" junit_version = "4.12"

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.17",
"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",

View File

@ -1,88 +1,105 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-jersey2</artifactId> <artifactId>swagger-petstore-jersey2</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-jersey2</name> <name>swagger-petstore-jersey2</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>2.12</version> <version>3.0.0-M1</version>
<configuration> <executions>
<systemProperties> <execution>
<property> <id>enforce-maven</id>
<name>loggerPath</name> <goals>
<value>conf/log4j.properties</value> <goal>enforce</goal>
</property> </goals>
</systemProperties> <configuration>
<argLine>-Xms512m -Xmx1500m</argLine> <rules>
<parallel>methods</parallel> <requireMavenVersion>
<forkMode>pertest</forkMode> <version>2.2.0</version>
</configuration> </requireMavenVersion>
</plugin> </rules>
<plugin> </configuration>
<artifactId>maven-dependency-plugin</artifactId> </execution>
<executions> </executions>
<execution> </plugin>
<phase>package</phase> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>copy-dependencies</goal> <artifactId>maven-surefire-plugin</artifactId>
</goals> <version>2.12</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <systemProperties>
</configuration> <property>
</execution> <name>loggerPath</name>
</executions> <value>conf/log4j.properties</value>
</plugin> </property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar --> <!-- attach test jar -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
<goal>test-jar</goal> <goal>test-jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -156,94 +173,95 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>sign</goal> <goal>sign</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<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-core-version}</version>
</dependency> </dependency>
<!-- HTTP client: jersey-client --> <!-- HTTP client: jersey-client -->
<dependency> <dependency>
<groupId>org.glassfish.jersey.core</groupId> <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version> <version>${jersey-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.joschi.jackson</groupId> <groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId> <artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-version}</version> <version>${jackson-version}</version>
</dependency> </dependency>
<!-- Base64 encoding that works in both JVM and Android --> <!-- Base64 encoding that works in both JVM and Android -->
<dependency> <dependency>
<groupId>com.brsanthu</groupId> <groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId> <artifactId>migbase64</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-core-version>1.5.18</swagger-core-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>2.25.1</jersey-version> <swagger-core-version>1.5.18</swagger-core-version>
<jackson-version>2.6.4</jackson-version> <jersey-version>2.25.1</jersey-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <jackson-version>2.6.4</jackson-version>
<junit-version>4.12</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version>
</properties> <junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
dependencies { dependencies {
compile 'io.swagger:swagger-annotations:1.5.15' compile 'io.swagger:swagger-annotations:1.5.17'
compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.8.1' compile 'com.google.code.gson:gson:2.8.1'

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.17",
"com.squareup.okhttp" % "okhttp" % "2.7.5", "com.squareup.okhttp" % "okhttp" % "2.7.5",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5", "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
"com.google.code.gson" % "gson" % "2.8.1", "com.google.code.gson" % "gson" % "2.8.1",

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -38,6 +38,9 @@ public class Animal implements Parcelable {
@SerializedName("color") @SerializedName("color")
private String color = "red"; private String color = "red";
public Animal() {
this.className = this.getClass().getSimpleName();
}
public Animal className(String className) { public Animal className(String className) {
this.className = className; this.className = className;
return this; return this;

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
dependencies { dependencies {
compile 'io.swagger:swagger-annotations:1.5.15' compile 'io.swagger:swagger-annotations:1.5.17'
compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.8.1' compile 'com.google.code.gson:gson:2.8.1'

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.17",
"com.squareup.okhttp" % "okhttp" % "2.7.5", "com.squareup.okhttp" % "okhttp" % "2.7.5",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5", "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
"com.google.code.gson" % "gson" % "2.8.1", "com.google.code.gson" % "gson" % "2.8.1",

View File

@ -1 +1 @@
2.3.1 2.4.0-SNAPSHOT

View File

@ -1,69 +1,86 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-resteasy</artifactId> <artifactId>swagger-petstore-resteasy</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-resteasy</name> <name>swagger-petstore-resteasy</name>
<version>1.0.0</version> <version>1.0.0</version>
<scm> <scm>
<connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection> <connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> </scm>
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>2.12</version> <version>3.0.0-M1</version>
<configuration> <executions>
<systemProperties> <execution>
<property> <id>enforce-maven</id>
<name>loggerPath</name> <goals>
<value>conf/log4j.properties</value> <goal>enforce</goal>
</property> </goals>
</systemProperties> <configuration>
<argLine>-Xms512m -Xmx1500m</argLine> <rules>
<parallel>methods</parallel> <requireMavenVersion>
<forkMode>pertest</forkMode> <version>2.2.0</version>
</configuration> </requireMavenVersion>
</plugin> </rules>
<plugin> </configuration>
<artifactId>maven-dependency-plugin</artifactId> </execution>
<executions> </executions>
<execution> </plugin>
<phase>package</phase> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>copy-dependencies</goal> <artifactId>maven-surefire-plugin</artifactId>
</goals> <version>2.12</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <systemProperties>
</configuration> <property>
</execution> <name>loggerPath</name>
</executions> <value>conf/log4j.properties</value>
</plugin> </property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar --> <!-- attach test jar -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
<goal>test-jar</goal> <goal>test-jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

View File

@ -1,246 +1,266 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-pestore-resttemplate-withxml</artifactId> <artifactId>swagger-pestore-resttemplate-withxml</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-pestore-resttemplate-withxml</name> <name>swagger-pestore-resttemplate-withxml</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>sign-artifacts</id>
<build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.5</version> <version>3.0.0-M1</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>enforce-maven</id>
<phase>verify</phase> <goals>
<goals> <goal>enforce</goal>
<goal>sign</goal> </goals>
</goals> <configuration>
</execution> <rules>
</executions> <requireMavenVersion>
</plugin> <version>2.2.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>
1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
<dependencies> <profiles>
<dependency> <profile>
<groupId>io.swagger</groupId> <id>sign-artifacts</id>
<artifactId>swagger-annotations</artifactId> <build>
<version>${swagger-annotations-version}</version> <plugins>
</dependency> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- HTTP client: Spring RestTemplate --> <dependencies>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>io.swagger</groupId>
<artifactId>spring-web</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${spring-web-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<!-- XML processing: Jackson --> <!-- HTTP client: Spring RestTemplate -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>org.springframework</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>spring-web</artifactId>
<version>${jackson-version}</version> <version>${spring-web-version}</version>
</dependency> </dependency>
<dependency> <!-- JSON processing: jackson -->
<groupId>com.github.joschi.jackson</groupId> <dependency>
<artifactId>jackson-datatype-threetenbp</artifactId> <groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson-threetenbp-version}</version> <artifactId>jackson-core</artifactId>
</dependency> <version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<!-- test dependencies --> <!-- XML processing: Jackson -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>junit</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
<version>${junit-version}</version> <version>${jackson-version}</version>
<scope>test</scope> </dependency>
</dependency>
</dependencies> <dependency>
<properties> <groupId>com.github.joschi.jackson</groupId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <artifactId>jackson-datatype-threetenbp</artifactId>
<swagger-annotations-version>1.5.15</swagger-annotations-version> <version>${jackson-threetenbp-version}</version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> </dependency>
<jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <!-- test dependencies -->
<maven-plugin-version>1.0.0</maven-plugin-version> <dependency>
<junit-version>4.12</junit-version> <groupId>junit</groupId>
</properties> <artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.17"
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"

View File

@ -1,238 +1,258 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-resttemplate</artifactId> <artifactId>swagger-petstore-resttemplate</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-resttemplate</name> <name>swagger-petstore-resttemplate</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>sign-artifacts</id>
<build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.5</version> <version>3.0.0-M1</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>enforce-maven</id>
<phase>verify</phase> <goals>
<goals> <goal>enforce</goal>
<goal>sign</goal> </goals>
</goals> <configuration>
</execution> <rules>
</executions> <requireMavenVersion>
</plugin> <version>2.2.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>
1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
<dependencies> <profiles>
<dependency> <profile>
<groupId>io.swagger</groupId> <id>sign-artifacts</id>
<artifactId>swagger-annotations</artifactId> <build>
<version>${swagger-annotations-version}</version> <plugins>
</dependency> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- HTTP client: Spring RestTemplate --> <dependencies>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>io.swagger</groupId>
<artifactId>spring-web</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${spring-web-version}</version> <version>${swagger-annotations-version}</version>
</dependency> </dependency>
<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-threetenbp-version}</version>
</dependency>
<!-- test dependencies --> <!-- HTTP client: Spring RestTemplate -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.springframework</groupId>
<artifactId>junit</artifactId> <artifactId>spring-web</artifactId>
<version>${junit-version}</version> <version>${spring-web-version}</version>
<scope>test</scope> </dependency>
</dependency>
</dependencies> <!-- JSON processing: jackson -->
<properties> <dependency>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <groupId>com.fasterxml.jackson.core</groupId>
<swagger-annotations-version>1.5.15</swagger-annotations-version> <artifactId>jackson-core</artifactId>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <version>${jackson-version}</version>
<jackson-version>2.8.9</jackson-version> </dependency>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <dependency>
<maven-plugin-version>1.0.0</maven-plugin-version> <groupId>com.fasterxml.jackson.core</groupId>
<junit-version>4.12</junit-version> <artifactId>jackson-annotations</artifactId>
</properties> <version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-threetenbp-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.17</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

View File

@ -1,88 +1,105 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-petstore-retrofit</artifactId> <artifactId>swagger-petstore-retrofit</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-petstore-retrofit</name> <name>swagger-petstore-retrofit</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>2.12</version> <version>3.0.0-M1</version>
<configuration> <executions>
<systemProperties> <execution>
<property> <id>enforce-maven</id>
<name>loggerPath</name> <goals>
<value>conf/log4j.properties</value> <goal>enforce</goal>
</property> </goals>
</systemProperties> <configuration>
<argLine>-Xms512m -Xmx1500m</argLine> <rules>
<parallel>methods</parallel> <requireMavenVersion>
<forkMode>pertest</forkMode> <version>2.2.0</version>
</configuration> </requireMavenVersion>
</plugin> </rules>
<plugin> </configuration>
<artifactId>maven-dependency-plugin</artifactId> </execution>
<executions> </executions>
<execution> </plugin>
<phase>package</phase> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>copy-dependencies</goal> <artifactId>maven-surefire-plugin</artifactId>
</goals> <version>2.12</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory> <systemProperties>
</configuration> <property>
</execution> <name>loggerPath</name>
</executions> <value>conf/log4j.properties</value>
</plugin> </property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar --> <!-- attach test jar -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
<goal>test-jar</goal> <goal>test-jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -155,73 +172,74 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>sign</goal> <goal>sign</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<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-core-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.retrofit</groupId> <groupId>com.squareup.retrofit</groupId>
<artifactId>retrofit</artifactId> <artifactId>retrofit</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>${okhttp-version}</version> <version>${okhttp-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<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>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-core-version>1.5.18</swagger-core-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<retrofit-version>1.9.0</retrofit-version> <swagger-core-version>1.5.18</swagger-core-version>
<okhttp-version>2.7.5</okhttp-version> <retrofit-version>1.9.0</retrofit-version>
<jodatime-version>2.9.9</jodatime-version> <okhttp-version>2.7.5</okhttp-version>
<oltu-version>1.0.1</oltu-version> <jodatime-version>2.9.9</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <maven-plugin-version>1.0.0</maven-plugin-version>
</properties> <junit-version>4.12</junit-version>
</properties>
</project> </project>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -36,6 +36,9 @@ public class Animal {
@SerializedName("color") @SerializedName("color")
private String color = "red"; private String color = "red";
public Animal() {
this.className = this.getClass().getSimpleName();
}
public Animal className(String className) { public Animal className(String className) {
this.className = className; this.className = className;
return this; return this;

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.15" swagger_annotations_version = "1.5.17"
junit_version = "4.12" junit_version = "4.12"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

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.15" % "compile", "io.swagger" % "swagger-annotations" % "1.5.17" % "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",

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

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.15" swagger_annotations_version = "1.5.17"
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"

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.15" % "compile", "io.swagger" % "swagger-annotations" % "1.5.17" % "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",

View File

@ -208,7 +208,6 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>

View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

View File

@ -36,6 +36,9 @@ public class Animal {
@SerializedName("color") @SerializedName("color")
private String color = "red"; private String color = "red";
public Animal() {
this.className = this.getClass().getSimpleName();
}
public Animal className(String className) { public Animal className(String className) {
this.className = className; this.className = className;
return this; return this;

View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

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.15" swagger_annotations_version = "1.5.17"
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"

Some files were not shown because too many files have changed in this diff Show More