diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
index beab949c29d..743aca536a8 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@@ -1,12 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
-    <parent>
-        <groupId>org.wso2.msf4j</groupId>
-        <artifactId>msf4j-service</artifactId>
-<version>2.0.0</version>
-    </parent> 
-
+  <parent>
+    <groupId>org.wso2.msf4j</groupId>
+    <artifactId>msf4j-service</artifactId>
+    <version>2.0.0</version>
+  </parent> 
   <modelVersion>4.0.0</modelVersion>
   <groupId>{{groupId}}</groupId>
   <artifactId>{{artifactId}}</artifactId>
@@ -16,7 +13,6 @@
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -28,7 +24,6 @@
           </archive>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -50,24 +45,23 @@
       </plugin>
     </plugins>
   </build>
-    <dependencies>
+  <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>${servlet-api-version}</version>
     </dependency>
     <dependency>
-            <groupId>org.wso2.msf4j</groupId>
-            <artifactId>msf4j-all</artifactId>
-	<version>2.0.0</version>
-        </dependency>
-     <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
-        </dependency> 
-</dependencies>
- 
+      <groupId>org.wso2.msf4j</groupId>
+      <artifactId>msf4j-all</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>2.4.1</version>
+    </dependency> 
+  </dependencies>
   <repositories>
     <repository>
       <id>sonatype-snapshots</id>
diff --git a/samples/server/petstore/java-msf4j/.swagger-codegen-ignore b/samples/server/petstore/java-msf4j/.swagger-codegen-ignore
index c5fa491b4c5..3adb38ed6e2 100644
--- a/samples/server/petstore/java-msf4j/.swagger-codegen-ignore
+++ b/samples/server/petstore/java-msf4j/.swagger-codegen-ignore
@@ -21,3 +21,4 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
+pom.xml
diff --git a/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh b/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh
new file mode 100755
index 00000000000..48e5cea3cfd
--- /dev/null
+++ b/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+java -version 2>&1 | grep "java version \"1.8"
+
+if [ $? -eq 0 ]
+then
+    echo "Running JDK8"
+    mvn test
+else
+    echo "Not running JDK8"
+fi
diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml
index d25dba1ac73..5fe8c46c238 100644
--- a/samples/server/petstore/java-msf4j/pom.xml
+++ b/samples/server/petstore/java-msf4j/pom.xml
@@ -1,19 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.wso2.msf4j</groupId>
-        <artifactId>msf4j-service</artifactId>
-        <version>2.0.0</version>
-    </parent> 
+  <parent>
+    <groupId>org.wso2.msf4j</groupId>
+    <artifactId>msf4j-service</artifactId>
+    <version>2.0.0</version>
+  </parent> 
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-msf4j-server</artifactId>
+  <artifactId>swagger-jaxrs-server</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-msf4j-server</name>
+  <name>swagger-jaxrs-server</name>
   <version>1.0.0</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -25,7 +24,6 @@
           </archive>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -45,26 +43,42 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+            <execution>
+                <id>Play Test</id>
+                <phase>integration-test</phase>
+                <goals>
+                    <goal>exec</goal>
+                </goals>
+                <configuration>
+                    <executable>./mvn_test_jdk8_only.sh</executable>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-    <dependencies>
+  <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>${servlet-api-version}</version>
     </dependency>
     <dependency>
-            <groupId>org.wso2.msf4j</groupId>
-            <artifactId>msf4j-all</artifactId>
-	<version>2.0.0</version>
-        </dependency>
-     <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.4.1</version>
-        </dependency> 
-</dependencies>
- 
+      <groupId>org.wso2.msf4j</groupId>
+      <artifactId>msf4j-all</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>2.4.1</version>
+    </dependency> 
+  </dependencies>
   <repositories>
     <repository>
       <id>sonatype-snapshots</id>
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
index 8d7e3c477d9..dab091c6a19 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
@@ -88,8 +88,8 @@ public Response testEnumParameters(@ApiParam(value = "Form parameter enum test (
 ,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString
 ,@ApiParam(value = "Query parameter enum test (string array)", allowableValues=">, $") @QueryParam("enum_query_string_array") List<String> enumQueryStringArray
 ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString
-,@ApiParam(value = "Query parameter enum test (double)") @QueryParam("enum_query_integer") Integer enumQueryInteger
-,@ApiParam(value = "Query parameter enum test (double)")  @FormParam("enum_query_double")  Double enumQueryDouble
+,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger
+,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2")  @FormParam("enum_query_double")  Double enumQueryDouble
 )
     throws NotFoundException {
         return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble);