bump jackson to 2.9.9 in resteasy

frantuma · frantuma · commit 0d1c4e6b52c1 · 2019-07-17T14:36:08.000+02:00
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -106,7 +106,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.6.4"
+    jackson_version = "2.9.9"
+    threetenbp_version = "2.6.4"
     jersey_version = "2.22.2"
     resteasy_version = "3.1.3.Final"
     {{^java8}}
@@ -130,7 +131,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     {{#java8}}
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     {{/java8}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
@@ -13,14 +13,14 @@ lazy val root = (project in file(".")).
       "org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9",
       {{#java8}}
-	  "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5",
+	  "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9",
 	  {{/java8}}
 	  {{^java8}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9",
       "joda-time" % "joda-time" % "2.9.4",
       "com.brsanthu" % "migbase64" % "2.2",
       {{/java8}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -235,7 +235,7 @@
         <dependency>
             <groupId>com.github.joschi.jackson</groupId>
             <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>${jackson-version}</version>
+            <version>${threetenbp-version}</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -249,7 +249,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.18</swagger-core-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
+        <threetenbp-version>2.6.4</threetenbp-version>
         {{^java8}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/java8}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -199,7 +199,7 @@
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
   {{#supportJava6}}
     <commons_io_version>2.5</commons_io_version>
     <commons_lang3_version>3.5</commons_lang3_version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache
@@ -20,7 +20,7 @@ dependencies {
 {{#useBeanValidation}}
     providedCompile 'javax.validation:validation-api:1.1.0.Final'
 {{/useBeanValidation}}
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger:swagger-jaxrs:1.5.12'
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION b/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.8-SNAPSHOT
diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle
@@ -94,7 +94,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.6.4"
+    jackson_version = "2.9.9"
+    threetenbp_version = "2.6.4"
     jersey_version = "2.22.2"
     resteasy_version = "3.1.3.Final"
     jodatime_version = "2.9.4"
@@ -112,7 +113,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     compile "joda-time:joda-time:$jodatime_version"
     compile "com.brsanthu:migbase64:2.2"
diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt
@@ -13,10 +13,10 @@ lazy val root = (project in file(".")).
       "org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
       "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
       "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9",
       "joda-time" % "joda-time" % "2.9.4",
       "com.brsanthu" % "migbase64" % "2.2",
       "junit" % "junit" % "4.12" % "test",
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
@@ -196,7 +196,7 @@
         <dependency>
             <groupId>com.github.joschi.jackson</groupId>
             <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>${jackson-version}</version>
+            <version>${threetenbp-version}</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -210,7 +210,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.18</swagger-core-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.9.9</jackson-version>
+        <threetenbp-version>2.6.4</threetenbp-version>
         <jodatime-version>2.9.9</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.8-SNAPSHOT
diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
@@ -18,13 +18,13 @@ dependencies {
     compile         'io.swagger:swagger-annotations:1.5.10'
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
     providedCompile 'javax.validation:validation-api:1.1.0.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger:swagger-jaxrs:1.5.12'
 
     testCompile     'junit:junit:4.12',
-                    'org.hamcrest:hamcrest-core:1.3'
+            'org.hamcrest:hamcrest-core:1.3'
 }
 
 sourceSets {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -49,7 +49,7 @@
                         <configuration>
                             <sources>
                                 <source>
-                                src/gen/java</source>
+                                    src/gen/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -168,7 +168,7 @@
         <version>1.1.0.Final</version>
         <scope>provided</scope>
     </dependency>
-        
+
     </dependencies>
     <repositories>
         <repository>
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.8-SNAPSHOT
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
@@ -13,13 +13,18 @@ dependencies {
     providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final'
     providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final'
     providedCompile 'javax.annotation:javax.annotation-api:1.2'
+    providedCompile 'javax:javaee-api:7.0'
     providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
     compile         'io.swagger:swagger-annotations:1.5.10'
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
-    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
+    providedCompile 'javax.validation:validation-api:1.1.0.Final'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
     compile         'joda-time:joda-time:2.7'
+    //TODO: swaggerFeature
+    compile 'io.swagger:swagger-jaxrs:1.5.12'
+
     testCompile     'junit:junit:4.12',
-                    'org.hamcrest:hamcrest-core:1.3'
+            'org.hamcrest:hamcrest-core:1.3'
 }
 
 sourceSets {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
@@ -49,7 +49,7 @@
                         <configuration>
                             <sources>
                                 <source>
-                                src/gen/java</source>
+                                    src/gen/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
+            <version>2.9.9</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -161,14 +161,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
-    <!-- Bean Validation API support -->
-    <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
-        <scope>provided</scope>
-    </dependency>
-        
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     <repositories>
         <repository>
