diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
index 877735c..c87882a 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_core.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
index 13e4e27..b63200c 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_core.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index fd844bc..3a9f526 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_sdk.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
index 168ae84..c21137d 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index 36b6353..b98baad 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_tests.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
index a8cf5b3..d01a1d1 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_tests.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 32da2f0..5123a44 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_ui.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.jst.jee.ui"
       license-feature="org.eclipse.license"
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index 779efb9..80c98be 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
index 74b4f28..64ab68e 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_core.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
index 7acece5..e124439 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_core.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
index f891e9d..e1667de 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.jst.web_js_support.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
index 0b3bce8..b20e061 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_js_support.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
index 1ab59ee..8d3ca8b 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_sdk.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
index d2a5bc1..998481a 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_sdk.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
index 37d861b..b43fed9 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_tests.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
index 1d3d77e..63dfaca 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_tests.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
index 60c3a42..3f9e4f3 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_ui.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
index 1177d2f..cceabf2 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_ui.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>