update dependency for java client (#5926)

OpenAPITools · Apr 14, 2020 · 747cd08 · 747cd08
1 parent 533d686
commit 747cd08
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 72 deletions.
diff --git a/...les/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/...les/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -68,7 +68,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'javax.annotation:javax.annotation-api:1.3.2'
         }
     }
 
@@ -126,21 +126,21 @@ if(hasProperty('target') && target == 'android') {
 }
 
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.22'
+    compile 'io.swagger:swagger-annotations:1.5.24'
     compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile 'com.squareup.okhttp3:okhttp:3.14.2'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile 'io.gsonfire:gson-fire:1.8.3'
+    compile 'com.squareup.okhttp3:okhttp:3.14.7'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
+    compile 'com.google.code.gson:gson:2.8.6'
+    compile 'io.gsonfire:gson-fire:1.8.4'
     {{#hasOAuthMethods}}
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
     {{/hasOAuthMethods}}
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     {{#joda}}
     compile 'joda-time:joda-time:2.9.9'
     {{/joda}}
     {{#threetenbp}}
-    compile 'org.threeten:threetenbp:1.4.0'
+    compile 'org.threeten:threetenbp:1.4.3'
     {{/threetenbp}}
     testCompile 'junit:junit:4.13'
 }

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -9,22 +9,23 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "com.squareup.okhttp3" % "okhttp" % "3.14.2",
-      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
-      "com.google.code.gson" % "gson" % "2.8.5",
-      "org.apache.commons" % "commons-lang3" % "3.9",
+      "io.swagger" % "swagger-annotations" % "1.5.24",
+      "com.squareup.okhttp3" % "okhttp" % "3.14.7",
+      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
+      "com.google.code.gson" % "gson" % "2.8.6",
+      "org.apache.commons" % "commons-lang3" % "3.10",
       {{#hasOAuthMethods}}
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
       {{/hasOAuthMethods}}
       {{#joda}}
       "joda-time" % "joda-time" % "2.9.9" % "compile",
       {{/joda}}
       {{#threetenbp}}
-      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
+      "org.threeten" % "threetenbp" % "1.4.3" % "compile",
       {{/threetenbp}}
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
-      "javax.annotation" % "jsr250-api" % "1.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -307,7 +307,7 @@
         {{/parcelableModel}}
         <dependency>
             <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
+            <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
         </dependency>
         <!-- test dependencies -->
@@ -322,19 +322,18 @@
         <java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.3</gson-fire-version>
-        <swagger-core-version>1.5.22</swagger-core-version>
-        <okhttp-version>3.14.2</okhttp-version>
-        <gson-version>2.8.5</gson-version>
-        <commons-lang3-version>3.9</commons-lang3-version>
+        <gson-fire-version>1.8.4</gson-fire-version>
+        <swagger-core-version>1.5.24</swagger-core-version>
+        <okhttp-version>3.14.7</okhttp-version>
+        <gson-version>2.8.6</gson-version>
+        <commons-lang3-version>3.10</commons-lang3-version>
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
         {{#threetenbp}}
-        <threetenbp-version>1.4.0</threetenbp-version>
+        <threetenbp-version>1.4.3</threetenbp-version>
         {{/threetenbp}}
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <javax-annotation-version>1.0</javax-annotation-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'javax.annotation:javax.annotation-api:1.3.2'
         }
     }
 
@@ -98,15 +98,15 @@ if(hasProperty('target') && target == 'android') {
 }
 
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.22'
+    compile 'io.swagger:swagger-annotations:1.5.24'
     compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile 'com.squareup.okhttp3:okhttp:3.14.2'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile 'io.gsonfire:gson-fire:1.8.3'
+    compile 'com.squareup.okhttp3:okhttp:3.14.7'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
+    compile 'com.google.code.gson:gson:2.8.6'
+    compile 'io.gsonfire:gson-fire:1.8.4'
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
-    compile 'org.threeten:threetenbp:1.4.0'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+    compile 'org.threeten:threetenbp:1.4.3'
     testCompile 'junit:junit:4.13'
 }
 

diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
@@ -9,15 +9,16 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "com.squareup.okhttp3" % "okhttp" % "3.14.2",
-      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
-      "com.google.code.gson" % "gson" % "2.8.5",
-      "org.apache.commons" % "commons-lang3" % "3.9",
+      "io.swagger" % "swagger-annotations" % "1.5.24",
+      "com.squareup.okhttp3" % "okhttp" % "3.14.7",
+      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
+      "com.google.code.gson" % "gson" % "2.8.6",
+      "org.apache.commons" % "commons-lang3" % "3.10",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
-      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
+      "org.threeten" % "threetenbp" % "1.4.3" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
-      "javax.annotation" % "jsr250-api" % "1.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -265,7 +265,7 @@
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
+            <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
         </dependency>
         <!-- test dependencies -->
@@ -280,14 +280,13 @@
         <java.version>1.7</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.3</gson-fire-version>
-        <swagger-core-version>1.5.22</swagger-core-version>
-        <okhttp-version>3.14.2</okhttp-version>
-        <gson-version>2.8.5</gson-version>
-        <commons-lang3-version>3.9</commons-lang3-version>
-        <threetenbp-version>1.4.0</threetenbp-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <javax-annotation-version>1.0</javax-annotation-version>
+        <gson-fire-version>1.8.4</gson-fire-version>
+        <swagger-core-version>1.5.24</swagger-core-version>
+        <okhttp-version>3.14.7</okhttp-version>
+        <gson-version>2.8.6</gson-version>
+        <commons-lang3-version>3.10</commons-lang3-version>
+        <threetenbp-version>1.4.3</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'javax.annotation:javax.annotation-api:1.3.2'
         }
     }
 
@@ -98,15 +98,15 @@ if(hasProperty('target') && target == 'android') {
 }
 
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.22'
+    compile 'io.swagger:swagger-annotations:1.5.24'
     compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile 'com.squareup.okhttp3:okhttp:3.14.2'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile 'io.gsonfire:gson-fire:1.8.3'
+    compile 'com.squareup.okhttp3:okhttp:3.14.7'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
+    compile 'com.google.code.gson:gson:2.8.6'
+    compile 'io.gsonfire:gson-fire:1.8.4'
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
-    compile 'org.threeten:threetenbp:1.4.0'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+    compile 'org.threeten:threetenbp:1.4.3'
     testCompile 'junit:junit:4.13'
 }
 

diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -9,15 +9,16 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "com.squareup.okhttp3" % "okhttp" % "3.14.2",
-      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
-      "com.google.code.gson" % "gson" % "2.8.5",
-      "org.apache.commons" % "commons-lang3" % "3.9",
+      "io.swagger" % "swagger-annotations" % "1.5.24",
+      "com.squareup.okhttp3" % "okhttp" % "3.14.7",
+      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
+      "com.google.code.gson" % "gson" % "2.8.6",
+      "org.apache.commons" % "commons-lang3" % "3.10",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
-      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
+      "org.threeten" % "threetenbp" % "1.4.3" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
-      "javax.annotation" % "jsr250-api" % "1.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -258,7 +258,7 @@
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
+            <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
         </dependency>
         <!-- test dependencies -->
@@ -273,14 +273,13 @@
         <java.version>1.7</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.3</gson-fire-version>
-        <swagger-core-version>1.5.22</swagger-core-version>
-        <okhttp-version>3.14.2</okhttp-version>
-        <gson-version>2.8.5</gson-version>
-        <commons-lang3-version>3.9</commons-lang3-version>
-        <threetenbp-version>1.4.0</threetenbp-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <javax-annotation-version>1.0</javax-annotation-version>
+        <gson-fire-version>1.8.4</gson-fire-version>
+        <swagger-core-version>1.5.24</swagger-core-version>
+        <okhttp-version>3.14.7</okhttp-version>
+        <gson-version>2.8.6</gson-version>
+        <commons-lang3-version>3.10</commons-lang3-version>
+        <threetenbp-version>1.4.3</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>