diff --git a/README.md b/README.md
index 7cb79aff36..4f05f936bc 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,8 @@ The OpenAPI Specification has undergone several revisions since initial creation
 
 Swagger core Version      | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-2.1.7 (**current stable**)| 2021-02-18   | 3.0           | [tag v2.1.7](https://github.com/swagger-api/swagger-core/tree/v2.1.7) | Supported
+2.1.8 (**current stable**)| 2021-04-18   | 3.0           | [tag v2.1.8](https://github.com/swagger-api/swagger-core/tree/v2.1.8) | Supported
+2.1.7                     | 2021-02-18   | 3.0           | [tag v2.1.7](https://github.com/swagger-api/swagger-core/tree/v2.1.7) | Supported
 2.1.6                     | 2020-12-04   | 3.0           | [tag v2.1.6](https://github.com/swagger-api/swagger-core/tree/v2.1.6) | Supported
 2.1.5                     | 2020-10-01   | 3.0           | [tag v2.1.5](https://github.com/swagger-api/swagger-core/tree/v2.1.5) | Supported
 2.1.4                     | 2020-07-24   | 3.0           | [tag v2.1.4](https://github.com/swagger-api/swagger-core/tree/v2.1.4) | Supported
@@ -72,7 +73,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.5 or greater
 
 
-### To build from source (currently 2.1.8-SNAPSHOT)
+### To build from source (currently 2.1.9-SNAPSHOT)
 ```
 # first time building locally
 mvn -N
diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
index e96ce98e9b..41a07a6528 100644
--- a/modules/swagger-annotations/pom.xml
+++ b/modules/swagger-annotations/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
index a6795e38af..6f4b100981 100644
--- a/modules/swagger-core/pom.xml
+++ b/modules/swagger-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-eclipse-transformer-maven-plugin/pom.xml b/modules/swagger-eclipse-transformer-maven-plugin/pom.xml
index 4520a3ee01..19684f7235 100644
--- a/modules/swagger-eclipse-transformer-maven-plugin/pom.xml
+++ b/modules/swagger-eclipse-transformer-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-gradle-plugin/README.md b/modules/swagger-gradle-plugin/README.md
index b58e869a8a..b537562ac0 100644
--- a/modules/swagger-gradle-plugin/README.md
+++ b/modules/swagger-gradle-plugin/README.md
@@ -26,7 +26,7 @@ Alternatively provide as value a classpath with the following dependencies (repl
 
 ```
 plugins {
-  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.1.7"
+  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.1.8"
 }
 ```
 ### Gradle 1.x and 2.0
@@ -43,7 +43,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "io.swagger.core.v3:swagger-gradle-plugin:2.1.7"
+    classpath "io.swagger.core.v3:swagger-gradle-plugin:2.1.8"
   }
 }
 
diff --git a/modules/swagger-gradle-plugin/gradle.properties b/modules/swagger-gradle-plugin/gradle.properties
index 2e728bd140..23fdd733ea 100644
--- a/modules/swagger-gradle-plugin/gradle.properties
+++ b/modules/swagger-gradle-plugin/gradle.properties
@@ -1,2 +1,2 @@
-version=2.1.8-SNAPSHOT
+version=2.1.8
 jettyVersion=9.4.39.v20210325
diff --git a/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java b/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java
index e00a5ff35a..44fbc849c4 100644
--- a/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java
+++ b/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java
@@ -16,7 +16,7 @@ public void apply(Project project) {
         config.defaultDependencies(new Action<DependencySet>() {
             public void execute(DependencySet dependencies) {
                 dependencies.add(project.getDependencies().create("org.apache.commons:commons-lang3:3.7"));
-                dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2:2.1.8-SNAPSHOT"));
+                dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2:2.1.8"));
                 dependencies.add(project.getDependencies().create("javax.ws.rs:javax.ws.rs-api:2.1"));
                 dependencies.add(project.getDependencies().create("javax.servlet:javax.servlet-api:3.1.0"));
             }
diff --git a/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java b/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
index bfdbf7e517..1d884247fd 100644
--- a/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
+++ b/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
@@ -82,7 +82,7 @@ public void testSwaggerResolveTask() throws IOException {
                 "    mavenCentral()\n" +
                 "}\n" +
                 "dependencies {  \n" +
-                "    compile group: 'io.swagger.core.v3', name: 'swagger-jaxrs2', version:'2.1.8-SNAPSHOT'\n" +
+                "    compile group: 'io.swagger.core.v3', name: 'swagger-jaxrs2', version:'2.1.8'\n" +
                 "    compile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version:'2.1'\n" +
                 "    compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'\n" +
                 "    testCompile group: 'com.github.tomakehurst', name: 'wiremock', version:'2.14.0'\n" +
diff --git a/modules/swagger-integration/pom.xml b/modules/swagger-integration/pom.xml
index c7e5d8528e..f6877a949a 100644
--- a/modules/swagger-integration/pom.xml
+++ b/modules/swagger-integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.swagger.core.v3</groupId>
 		<artifactId>swagger-project</artifactId>
-		<version>2.1.8-SNAPSHOT</version>
+		<version>2.1.8</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>swagger-integration</artifactId>
diff --git a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
index dd62e02f05..497197d2f2 100644
--- a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
+++ b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>swagger-project</artifactId>
         <groupId>io.swagger.core.v3</groupId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-jaxrs2-servlet-initializer/pom.xml b/modules/swagger-jaxrs2-servlet-initializer/pom.xml
index 38690e1e06..69aa203dfa 100644
--- a/modules/swagger-jaxrs2-servlet-initializer/pom.xml
+++ b/modules/swagger-jaxrs2-servlet-initializer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>swagger-project</artifactId>
         <groupId>io.swagger.core.v3</groupId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml
index 79bd55ce02..1b1275c02c 100644
--- a/modules/swagger-jaxrs2/pom.xml
+++ b/modules/swagger-jaxrs2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>swagger-project</artifactId>
         <groupId>io.swagger.core.v3</groupId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-maven-plugin/README.md b/modules/swagger-maven-plugin/README.md
index 1a445eb656..cae7c53e13 100644
--- a/modules/swagger-maven-plugin/README.md
+++ b/modules/swagger-maven-plugin/README.md
@@ -22,7 +22,7 @@ Both `javax` and `jakarta` examples are provided below
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.8</version>
                 <configuration>
                     <outputFileName>openapi</outputFileName>
                     <outputPath>${project.build.directory}/generatedtest</outputPath>
@@ -47,7 +47,7 @@ Both `javax` and `jakarta` examples are provided below
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-jaxrs2</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
@@ -73,7 +73,7 @@ Both `javax` and `jakarta` examples are provided below
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin-jakarta</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.8</version>
                 <configuration>
                     <outputFileName>openapi</outputFileName>
                     <outputPath>${project.build.directory}/generatedtest</outputPath>
@@ -98,7 +98,7 @@ Both `javax` and `jakarta` examples are provided below
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-jaxrs2-jakarta</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
 
         <dependency>
@@ -126,7 +126,7 @@ Both `javax` and `jakarta` examples are provided below
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.8</version>
                 <configuration>
                     <outputFileName>openapi</outputFileName>
                     <outputPath>${project.build.directory}/generatedtest</outputPath>
@@ -155,7 +155,7 @@ Both `javax` and `jakarta` examples are provided below
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin-jakarta</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.8</version>
                 <configuration>
                     <outputFileName>openapi</outputFileName>
                     <outputPath>${project.build.directory}/generatedtest</outputPath>
diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml
index 4179d54b7e..12cee05e7c 100644
--- a/modules/swagger-maven-plugin/pom.xml
+++ b/modules/swagger-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
index a6617e4081..ab0db3f117 100644
--- a/modules/swagger-models/pom.xml
+++ b/modules/swagger-models/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml
index 9436084321..897a71a9bf 100644
--- a/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml
index 94edcc9cbb..95ad9846d5 100644
--- a/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml
index 6277058337..963a48b001 100644
--- a/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml
index 931c02be28..19cbe2e6e3 100644
--- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml
index 4f014a3b5f..c42fdc85ff 100644
--- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml
index 71ac1de0b2..5312da6c20 100644
--- a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-v2-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml
index 2013cecee5..b5893fee36 100644
--- a/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml
index b2a157e1ca..b1f63f167e 100644
--- a/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/modules/swagger-models-jakarta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project-jakarta</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
index 482e77f965..ecf7481f46 100644
--- a/modules/swagger-project-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/pom.xml
@@ -6,7 +6,7 @@
     <packaging>pom</packaging>
     <name>swagger-project-jakarta</name>
     <description>swagger-project-jakarta</description>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <url>https://github.com/swagger-api/swagger-core</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-core.git</connection>
diff --git a/pom.xml b/pom.xml
index 725ec9d9e1..c41e7d282a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <packaging>pom</packaging>
     <name>swagger-project</name>
     <description>swagger-project</description>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <url>https://github.com/swagger-api/swagger-core</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-core.git</connection>