diff --git a/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh b/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh
index eb79a73b25a..837af96bdaa 100755
--- a/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh
+++ b/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true"
+ags="$@ generate --artifact-id swagger-cxf-annotated-basepath -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-cxf-petstore-server-non-spring-application.sh b/bin/jaxrs-cxf-petstore-server-non-spring-application.sh
index e22a18dea6e..ac85e109deb 100755
--- a/bin/jaxrs-cxf-petstore-server-non-spring-application.sh
+++ b/bin/jaxrs-cxf-petstore-server-non-spring-application.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true"
+ags="$@ generate --artifact-id swagger-cxf-server-non-spring -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
index 6f5a46a6f7d..f3d02db08e1 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -188,7 +188,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
 {{/useBeanValidation}}    
     <cxf-version>3.1.11</cxf-version>
-    <jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
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 e7e0e19e569..ad4c3ae9c33 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.11</cxf-version>
-    <jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache
index a865adc3c11..4972cb349c1 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache
+++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache
@@ -273,7 +273,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.9</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
     <jersey-version>2.22.2</jersey-version>
     <jackson-version>2.7.5</jackson-version>
     {{^java8}}
diff --git a/pom.xml.circleci b/pom.xml.circleci
index 47d656d1ccf..4d0732e22fa 100644
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@@ -897,7 +897,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.28</swagger-parser-version>
+        <swagger-parser-version>1.0.30</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <swagger-core-version>1.5.15</swagger-core-version>
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index c40bf36b6b3..8abcc8d6bf7 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -250,7 +250,7 @@
     <swagger-core-version>1.5.15</swagger-core-version>
     <feign-version>9.4.0</feign-version>
     <feign-form-version>2.1.0</feign-form-version>
-    <jackson-version>2.8.7</jackson-version>
+    <jackson-version>2.8.9</jackson-version>
     <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index c0ff1a42251..92265cc8ccf 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -119,11 +119,7 @@
     </repositories>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-<<<<<<< HEAD
-        <swagger-inflector-version>1.0.12</swagger-inflector-version>
-=======
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
->>>>>>> origin/master
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION
index 7fea99011a6..f9f7450d135 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
index 307ee24ba70..a7040fdae1c 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/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.15</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.11</cxf-version>
+    <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION
index 7fea99011a6..f9f7450d135 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
index 97d19784600..d2012f38a76 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -3,7 +3,7 @@
   <groupId>io.swagger</groupId>
   <artifactId>swagger-cxf-server-non-spring</artifactId>
   <packaging>war</packaging>
-  <name>swagger-cxf-non-spring</name>
+  <name>swagger-cxf-server-non-spring</name>
   <version>1.0.0</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
@@ -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.15</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.11</cxf-version>
+    <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
index 93f4ec76ecb..4387e631154 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -162,7 +162,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.9</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
index 1d0cfada829..ea3ff373067 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
@@ -154,7 +154,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-core-version>1.5.9</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>