From 165076a4273c30520a44b571085279eefde39a03 Mon Sep 17 00:00:00 2001
From: Johannes Fiala <johannes.fiala@fwd.at>
Date: Sun, 5 Mar 2017 17:30:17 +0100
Subject: [PATCH 1/2] add jackson dependencies to pom #4924

---
 .../JavaJaxRS/cxf/server/pom.mustache         | 13 +++++++++++
 samples/server/petstore/jaxrs-cxf/pom.xml     | 23 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
index 386f337867a..6aca3eab56d 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -160,6 +160,18 @@
         <version>${cxf-version}</version>
         <scope>compile</scope>
     </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>${jackson-jaxrs-version}</version>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+       <groupId>com.fasterxml.jackson.datatype</groupId>
+       <artifactId>jackson-datatype-joda</artifactId>
+       <version>${jackson-jaxrs-version}</version>
+       <scope>compile</scope>
+    </dependency>
 {{#generateSpringApplication}}    
     <!-- Spring -->
     <dependency>
@@ -233,6 +245,7 @@
     <spring.boot-version>1.3.3.RELEASE</spring.boot-version>
 {{/generateSpringBootApplication}}    
     <cxf-version>3.1.8</cxf-version>
+    <jackson-jaxrs-version>2.4.5</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
index cdf3a68ed8f..3b4ff93c27e 100644
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -112,6 +112,13 @@
       <version>${junit-version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>${beanvalidation-version}</version>
+        <scope>provided</scope>
+    </dependency>
     <!-- CXF Client -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -151,6 +158,18 @@
         <version>${cxf-version}</version>
         <scope>compile</scope>
     </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>${jackson-jaxrs-version}</version>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+       <groupId>com.fasterxml.jackson.datatype</groupId>
+       <artifactId>jackson-datatype-joda</artifactId>
+       <version>${jackson-jaxrs-version}</version>
+       <scope>compile</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -165,13 +184,15 @@
     <java.version>1.7</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.10</swagger-core-version>
+    <swagger-core-version>1.5.12</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.12</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.1.8</cxf-version>
+    <jackson-jaxrs-version>2.4.5</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>

From f72340fb17f52665cf03b9906dc42a85ba64eb13 Mon Sep 17 00:00:00 2001
From: Johannes Fiala <johannes.fiala@fwd.at>
Date: Sun, 5 Mar 2017 19:17:27 +0100
Subject: [PATCH 2/2] change jackson jaxrs version to 2.8.4 #4924

---
 .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache        | 2 +-
 samples/server/petstore/jaxrs-cxf/pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
index 6aca3eab56d..ec2559bd6db 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -245,7 +245,7 @@
     <spring.boot-version>1.3.3.RELEASE</spring.boot-version>
 {{/generateSpringBootApplication}}    
     <cxf-version>3.1.8</cxf-version>
-    <jackson-jaxrs-version>2.4.5</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
index 3b4ff93c27e..59b8b3545d8 100644
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -192,7 +192,7 @@
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.1.8</cxf-version>
-    <jackson-jaxrs-version>2.4.5</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>