diff --git a/CI/pom.xml.bash b/CI/pom.xml.bash
index 403310dc4a12..b2c744f5692b 100644
--- a/CI/pom.xml.bash
+++ b/CI/pom.xml.bash
@@ -920,7 +920,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.1</swagger-parser-version>
+        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci
index 20a1e5c6a7fc..6fa76524149b 100644
--- a/CI/pom.xml.circleci
+++ b/CI/pom.xml.circleci
@@ -976,7 +976,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.1</swagger-parser-version>
+        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7
index d7b6e7122bda..216d3f402ed2 100644
--- a/CI/pom.xml.circleci.java7
+++ b/CI/pom.xml.circleci.java7
@@ -948,7 +948,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.1</swagger-parser-version>
+        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.ios b/CI/pom.xml.ios
index eb838c4eb4e9..10521b57074b 100644
--- a/CI/pom.xml.ios
+++ b/CI/pom.xml.ios
@@ -928,7 +928,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.1</swagger-parser-version>
+        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 80024d1935d2..1bb8681e5032 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -204,9 +204,9 @@
             <version>${swagger-core-version}</version>
         </dependency>
         <dependency> 
-            <groupId>io.swagger.parser.v3</groupId> 
-            <artifactId>swagger-parser</artifactId> 
-            <version>${swagger-parser-version}</version> 
+            <groupId>org.openapitools.swagger.parser</groupId>
+            <artifactId>swagger-parser</artifactId>
+            <version>${swagger-parser-version}</version>
         </dependency> 
         <dependency>
             <groupId>com.samskivert</groupId>
diff --git a/pom.xml b/pom.xml
index 277807a614a3..0d3773578e50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1054,7 +1054,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.1</swagger-parser-version>
+        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>