diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
index f90d2564187..8a04d1cad7e 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
@@ -15,8 +15,8 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
index edaa0f9becb..ca5e8d34968 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
@@ -3,7 +3,8 @@ package {{package}};
 import {{package}}.*;
 import {{modelPackage}}.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 {{#imports}}import {{import}};
 {{/imports}}
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
index af1b56fc69c..7b66d35361b 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
@@ -11,7 +11,8 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
index 9a7ff6ea6cf..249266065db 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
@@ -1,3 +1,3 @@
 {{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/notFile}}{{#isFile}}
             @FormDataParam("{{paramName}}") InputStream {{paramName}}InputStream,
-            @FormDataParam("{{paramName}}") FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
+            @FormDataParam("{{paramName}}") FileInfo {{paramName}}Detail{{/isFile}}{{/isFormParam}}
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
index ff9764e8e95..7839f9c1ec2 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@@ -66,16 +66,6 @@
             <artifactId>jackson-datatype-joda</artifactId>
             <version>2.4.1</version>
         </dependency> 
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-multipart</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency> 
 </dependencies>
  
   <repositories>
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
index dc2d2eb1ecf..c58393551df 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream {{paramName}}InputStream, FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream {{paramName}}InputStream, FileInfo {{paramName}}Detail{{/isFile}}{{/isFormParam}}