Merge branch 'master' into java-docs

Conflicts: modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java samples/client/petstore/java/default/pom.xml samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
2016-04-19 20:19:10 +08:00
parent 7a0eef61d0 3332692d30
commit f10d4c8e23
1173 changed files with 38550 additions and 26332 deletions
--- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
    apply plugin: 'com.github.dcendents.android-maven'
    
    android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
        defaultConfig {
            minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
        }
        compileOptions {
            sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,7 +98,7 @@ ext {
    jackson_version = "2.4.2"
    jersey_version = "1.18"
    jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }

 dependencies {
--- a/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
+{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
    apply plugin: 'com.github.dcendents.android-maven'
    
    android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
        defaultConfig {
            minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
        }
        compileOptions {
            sourceCompatibility JavaVersion.VERSION_1_7
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@@ -110,7 +110,7 @@
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
    </dependency>

    <!-- HTTP client: Netflix Feign -->
@@ -179,7 +179,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
    <feign-version>8.1.1</feign-version>
    <jackson-version>2.6.3</jackson-version>
    <jodatime-version>2.5</jodatime-version>
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
    apply plugin: 'com.github.dcendents.android-maven'

    android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
        defaultConfig {
            minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
        }
        compileOptions {
            sourceCompatibility JavaVersion.VERSION_1_7
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -131,7 +131,7 @@
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
    </dependency>

    <!-- HTTP client: jersey-client -->
@@ -194,7 +194,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
    <jersey-version>2.22</jersey-version>
    <jackson-version>2.4.2</jackson-version>
    <jodatime-version>2.3</jodatime-version>
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
    apply plugin: 'com.github.dcendents.android-maven'

    android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
        defaultConfig {
            minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
        }
        compileOptions {
            sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,5 +98,5 @@ dependencies {
    compile 'com.squareup.okhttp:okhttp:2.7.2'
    compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
    compile 'com.google.code.gson:gson:2.3.1'
-    testCompile 'junit:junit:4.8.1'
+    testCompile 'junit:junit:4.12'
 }
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -132,7 +132,7 @@
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
    </dependency>
    <dependency>
      <groupId>com.squareup.okhttp</groupId>
@@ -159,10 +159,10 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
    <okhttp-version>2.7.2</okhttp-version>
    <gson-version>2.3.1</gson-version>
    <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
  </properties>
 </project>
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
    apply plugin: 'com.github.dcendents.android-maven'
    
    android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
        defaultConfig {
            minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
        }
        compileOptions {
            sourceCompatibility JavaVersion.VERSION_1_7
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -110,7 +110,7 @@
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
    </dependency>
    <dependency>
      <groupId>com.squareup.retrofit</groupId>
@@ -137,7 +137,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
    <retrofit-version>1.9.0</retrofit-version>
    <okhttp-version>2.4.0</okhttp-version>
    <oltu-version>1.0.0</oltu-version>
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
    }
 }

@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'

 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
@@ -46,6 +46,10 @@ if(hasProperty('target') && target == 'android') {
 	            }
 	        }
 	    }
+
+      dependencies {
+          provided 'javax.annotation:jsr250-api:1.0'
+      }
 	}

 	afterEvaluate {
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -111,7 +111,7 @@
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
    </dependency>
    <dependency>
      <groupId>com.squareup.retrofit2</groupId>
@@ -153,7 +153,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
    <retrofit-version>2.0.0-beta4</retrofit-version>{{#useRxJava}}
    <rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
    <oltu-version>1.0.0</oltu-version>
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -171,11 +171,11 @@
  </dependencies>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <swagger-annotations-version>1.5.8</swagger-annotations-version>
    <jersey-version>1.18</jersey-version>
    <jackson-version>2.4.2</jackson-version>
    <jodatime-version>2.3</jodatime-version>
    <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
  </properties>
 </project>