diff --git a/common/features/org.jboss.tools.common.all.feature/feature.xml b/common/features/org.jboss.tools.common.all.feature/feature.xml
index 62f450c590..547f84f169 100644
--- a/common/features/org.jboss.tools.common.all.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.all.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.all.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%featureProvider"
       plugin="org.jboss.tools.common.el.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.all.feature/pom.xml b/common/features/org.jboss.tools.common.all.feature/pom.xml
index e23bb958f8..684f24a1ff 100644
--- a/common/features/org.jboss.tools.common.all.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.all.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.all.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.all.test.feature/feature.xml b/common/features/org.jboss.tools.common.all.test.feature/feature.xml
index 59af5628b1..7b10779dc2 100644
--- a/common/features/org.jboss.tools.common.all.test.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.all.test.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.all.test.feature" label="%featureName" version="3.17.700.qualifier" provider-name="%featureProvider" image="eclipse_update_120.jpg"
+<feature id="org.jboss.tools.common.all.test.feature" label="%featureName" version="3.18.0.qualifier" provider-name="%featureProvider" image="eclipse_update_120.jpg"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/common/features/org.jboss.tools.common.all.test.feature/pom.xml b/common/features/org.jboss.tools.common.all.test.feature/pom.xml
index b1b626764c..65ba0395b3 100644
--- a/common/features/org.jboss.tools.common.all.test.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.all.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.all.test.feature</artifactId>
diff --git a/common/features/org.jboss.tools.common.core.feature/feature.xml b/common/features/org.jboss.tools.common.core.feature/feature.xml
index 7d47ee989f..98844db287 100644
--- a/common/features/org.jboss.tools.common.core.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.core.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.projecttemplates"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.core.feature/pom.xml b/common/features/org.jboss.tools.common.core.feature/pom.xml
index 6fc38b7097..04cfd6d5e5 100644
--- a/common/features/org.jboss.tools.common.core.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.core.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.core.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.feature/feature.xml b/common/features/org.jboss.tools.common.feature/feature.xml
index c520dc6e36..7554de66b5 100644
--- a/common/features/org.jboss.tools.common.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.el.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.feature/pom.xml b/common/features/org.jboss.tools.common.feature/pom.xml
index b8cafb0298..aa17e54a09 100644
--- a/common/features/org.jboss.tools.common.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.jdt.feature/feature.xml b/common/features/org.jboss.tools.common.jdt.feature/feature.xml
index 37b51b6c70..3fb9b1dee5 100644
--- a/common/features/org.jboss.tools.common.jdt.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.jdt.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.jdt.feature" label="%featureName" version="3.17.700.qualifier" provider-name="%providerName" plugin="org.jboss.tools.common.jdt.debug"
+<feature id="org.jboss.tools.common.jdt.feature" label="%featureName" version="3.18.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.common.jdt.debug"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
 
diff --git a/common/features/org.jboss.tools.common.jdt.feature/pom.xml b/common/features/org.jboss.tools.common.jdt.feature/pom.xml
index d62dfcbcbe..87a3ac215c 100644
--- a/common/features/org.jboss.tools.common.jdt.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.jdt.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.jdt.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.oauth.feature/feature.xml b/common/features/org.jboss.tools.common.oauth.feature/feature.xml
index 78842231c7..db2b5d0a1c 100644
--- a/common/features/org.jboss.tools.common.oauth.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.oauth.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.oauth.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.oauth.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.oauth.feature/pom.xml b/common/features/org.jboss.tools.common.oauth.feature/pom.xml
index 277f71632f..a63f7e6976 100644
--- a/common/features/org.jboss.tools.common.oauth.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.oauth.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.oauth.feature</artifactId>
diff --git a/common/features/org.jboss.tools.common.text.ext.feature/feature.xml b/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
index ddcfe0422b..498142a81f 100644
--- a/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.text.ext.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.text.ext"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.text.ext.feature/pom.xml b/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
index 6b82631aa7..16485faa0b 100644
--- a/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.text.ext.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.ui.feature/feature.xml b/common/features/org.jboss.tools.common.ui.feature/feature.xml
index 9bea2baf61..caf89b0787 100644
--- a/common/features/org.jboss.tools.common.ui.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.ui.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.ui.feature/pom.xml b/common/features/org.jboss.tools.common.ui.feature/pom.xml
index 394af64ab4..29cacf2a36 100644
--- a/common/features/org.jboss.tools.common.ui.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.ui.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.ui.feature</artifactId> 
diff --git a/common/features/org.jboss.tools.common.verification.feature/feature.xml b/common/features/org.jboss.tools.common.verification.feature/feature.xml
index 998ece8ca5..f7c443b26d 100644
--- a/common/features/org.jboss.tools.common.verification.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.verification.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.common.verification.feature"
       label="%featureName"
-      version="3.17.700.qualifier"
+      version="3.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.common.verification.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/common/features/org.jboss.tools.common.verification.feature/pom.xml b/common/features/org.jboss.tools.common.verification.feature/pom.xml
index 42f399c02a..24bcf7a9bb 100644
--- a/common/features/org.jboss.tools.common.verification.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.verification.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>features</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.features</groupId>
 	<artifactId>org.jboss.tools.common.verification.feature</artifactId> 
diff --git a/common/features/pom.xml b/common/features/pom.xml
index e38c7192f2..ca912aa7a6 100644
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>	
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>common</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF
index 32950ed133..4675787848 100644
--- a/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="2.3.0",
  org.apache.commons.httpclient;bundle-version="3.1.0",
  org.jboss.tools.foundation.core;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.jst.j2ee.web;bundle-version="1.1.800"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/common/plugins/org.jboss.tools.common.core/pom.xml b/common/plugins/org.jboss.tools.common.core/pom.xml
index a7d7a8b006..d6e3c11a68 100644
--- a/common/plugins/org.jboss.tools.common.core/pom.xml
+++ b/common/plugins/org.jboss.tools.common.core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.core</artifactId>
diff --git a/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
index 7b011bfc93..0194de5aff 100644
--- a/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.el.core;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Export-Package: org.jboss.tools.common.el.core,
  org.jboss.tools.common.el.core.ca,
  org.jboss.tools.common.el.core.ca.preferences,
diff --git a/common/plugins/org.jboss.tools.common.el.core/pom.xml b/common/plugins/org.jboss.tools.common.el.core/pom.xml
index a0f43e3fb2..00f5a1f3f8 100644
--- a/common/plugins/org.jboss.tools.common.el.core/pom.xml
+++ b/common/plugins/org.jboss.tools.common.el.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.el.core</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
index f4a470163e..fc66427445 100644
--- a/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.el.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Export-Package: org.jboss.tools.common.el.ui,
  org.jboss.tools.common.el.ui.ca,
  org.jboss.tools.common.el.ui.internal.info
diff --git a/common/plugins/org.jboss.tools.common.el.ui/pom.xml b/common/plugins/org.jboss.tools.common.el.ui/pom.xml
index 69bfe4e3af..f00289e042 100644
--- a/common/plugins/org.jboss.tools.common.el.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.el.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.el.ui</artifactId> 
-	<version>3.17.700-SNAPSHOT</version>
+	<version>3.18.0-SNAPSHOT</version>
 	
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF
index 486e4e8e4a..a28657b17c 100644
--- a/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF
@@ -27,6 +27,6 @@ Require-Bundle: org.jboss.tools.common,
  org.eclipse.gef;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BundleShape: dir
diff --git a/common/plugins/org.jboss.tools.common.gef/pom.xml b/common/plugins/org.jboss.tools.common.gef/pom.xml
index 8f649d14d4..7f2ba2aa30 100644
--- a/common/plugins/org.jboss.tools.common.gef/pom.xml
+++ b/common/plugins/org.jboss.tools.common.gef/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.gef</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.jdt.debug.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.jdt.debug.ui/META-INF/MANIFEST.MF
index d3b5d8e489..fa47e8f574 100644
--- a/common/plugins/org.jboss.tools.common.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.common.jdt.debug.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.jdt.debug.ui.RemoteDebugUIActivator
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.jdt.debug.ui/pom.xml b/common/plugins/org.jboss.tools.common.jdt.debug.ui/pom.xml
index b960e9d595..e55ee177cf 100644
--- a/common/plugins/org.jboss.tools.common.jdt.debug.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.jdt.debug.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.jdt.debug.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.jdt.debug/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.jdt.debug/META-INF/MANIFEST.MF
index e79a1ae8e7..91142a0325 100644
--- a/common/plugins/org.jboss.tools.common.jdt.debug/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.jdt.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.common.jdt.debug;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.jdt.debug.RemoteDebugActivator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
diff --git a/common/plugins/org.jboss.tools.common.jdt.debug/pom.xml b/common/plugins/org.jboss.tools.common.jdt.debug/pom.xml
index fb2d608d62..20ccd1ebb4 100644
--- a/common/plugins/org.jboss.tools.common.jdt.debug/pom.xml
+++ b/common/plugins/org.jboss.tools.common.jdt.debug/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.jdt.debug</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF
index f3df85db1a..f50005254b 100644
--- a/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.jdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.common.jdt.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.jdt.ui.JDTExtUIActivator
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.jdt.ui/pom.xml b/common/plugins/org.jboss.tools.common.jdt.ui/pom.xml
index 9da5396ba5..b3775007fe 100644
--- a/common/plugins/org.jboss.tools.common.jdt.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.jdt.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.jdt.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF
index c0b01149fb..f51b3bbe0b 100644
--- a/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.common.jdt;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.jdt.core.JDTExtActivator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.jdt/pom.xml b/common/plugins/org.jboss.tools.common.jdt/pom.xml
index aa25664abb..a303d22e83 100644
--- a/common/plugins/org.jboss.tools.common.jdt/pom.xml
+++ b/common/plugins/org.jboss.tools.common.jdt/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.jdt</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF
index 9ab8097091..c12d132b39 100644
--- a/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.meta.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.jboss.tools.common.model,
diff --git a/common/plugins/org.jboss.tools.common.meta.ui/pom.xml b/common/plugins/org.jboss.tools.common.meta.ui/pom.xml
index ec75d369f7..9ad1b335d4 100644
--- a/common/plugins/org.jboss.tools.common.meta.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.meta.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.meta.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
index 6d2a5c4d81..a450808be0 100644
--- a/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.jboss.tools.common.model.ui.capabilities;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0"
diff --git a/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml b/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
index 8b117987d4..932ca13424 100644
--- a/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
+++ b/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.model.ui.capabilities</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
index a6bafcddaf..329a7e4b2e 100644
--- a/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
@@ -92,7 +92,7 @@ Require-Bundle: org.jboss.tools.common.model;visibility:=reexport,
  org.jboss.tools.common.ui;visibility:=reexport,
  org.eclipse.jst.standard.schemas;bundle-version="1.2.0",
  org.eclipse.wst.standard.schemas
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: org.jboss.tools.common.model.ui.jar
 Eclipse-BundleShape: dir
diff --git a/common/plugins/org.jboss.tools.common.model.ui/pom.xml b/common/plugins/org.jboss.tools.common.model.ui/pom.xml
index b64b38abe2..081c972652 100644
--- a/common/plugins/org.jboss.tools.common.model.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.model.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.model.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
index 4cb018d3e0..a73d094e4d 100644
--- a/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
@@ -89,7 +89,7 @@ Require-Bundle: org.jboss.tools.common;visibility:=reexport,
  org.eclipse.core.filesystem,
  org.jboss.tools.common.model.ui.capabilities;bundle-version="3.6.0",
  org.eclipse.jdt.core.manipulation
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: org.jboss.tools.common.model.jar
 Eclipse-BundleShape: dir
diff --git a/common/plugins/org.jboss.tools.common.model/pom.xml b/common/plugins/org.jboss.tools.common.model/pom.xml
index 8b8b281c0c..76e25c91a4 100644
--- a/common/plugins/org.jboss.tools.common.model/pom.xml
+++ b/common/plugins/org.jboss.tools.common.model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.model</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.oauth.core/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.oauth.core/META-INF/MANIFEST.MF
index 7cabb456dc..2693795f58 100644
--- a/common/plugins/org.jboss.tools.common.oauth.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.oauth.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: %Bundle-Name.0
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.jboss.tools.common.oauth.core;singleton:=true
 Bundle-Localization: plugin
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/common/plugins/org.jboss.tools.common.oauth.core/pom.xml b/common/plugins/org.jboss.tools.common.oauth.core/pom.xml
index 24e898b00a..44812f658f 100644
--- a/common/plugins/org.jboss.tools.common.oauth.core/pom.xml
+++ b/common/plugins/org.jboss.tools.common.oauth.core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.oauth.core</artifactId>
diff --git a/common/plugins/org.jboss.tools.common.oauth.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.oauth.ui/META-INF/MANIFEST.MF
index 8ddd51ae34..c111a504cf 100644
--- a/common/plugins/org.jboss.tools.common.oauth.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.oauth.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-ActivationPolicy: lazy
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.oauth.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/org.jboss.tools.common.oauth.ui/pom.xml b/common/plugins/org.jboss.tools.common.oauth.ui/pom.xml
index 89f33235ed..b0d59732d3 100644
--- a/common/plugins/org.jboss.tools.common.oauth.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.oauth.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.oauth.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
index b3491d7051..753ca43851 100644
--- a/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-SymbolicName: org.jboss.tools.common.projecttemplates;singleton:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui;bundle-version="3.7.0",
  org.jboss.tools.common
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-BundleShape: dir
diff --git a/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml b/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
index fb48cc4cbf..b0d2c62a90 100644
--- a/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
+++ b/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.projecttemplates</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
index 28fe9c96cb..099bf97e33 100644
--- a/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.resref.core;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.resref.core.ResourceReferencePlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
diff --git a/common/plugins/org.jboss.tools.common.resref.core/pom.xml b/common/plugins/org.jboss.tools.common.resref.core/pom.xml
index 2b281fbd7f..0f3404adee 100644
--- a/common/plugins/org.jboss.tools.common.resref.core/pom.xml
+++ b/common/plugins/org.jboss.tools.common.resref.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.resref.core</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF
index 8242441cec..c1660d0f95 100644
--- a/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.resref.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.resref.ui.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.resref.ui/pom.xml b/common/plugins/org.jboss.tools.common.resref.ui/pom.xml
index 1413c9ab99..d4fc2f2220 100644
--- a/common/plugins/org.jboss.tools.common.resref.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.resref.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.resref.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
index 0bff0e8afa..89bd9debde 100644
--- a/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.jboss.tools.common.text.ext,
  org.jboss.tools.common.text.ext.hyperlink.xpl,
  org.jboss.tools.common.text.ext.util,
  org.jboss.tools.common.text.ext.util.xpl
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Name: %Bundle-Name.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: %providerName
diff --git a/common/plugins/org.jboss.tools.common.text.ext/pom.xml b/common/plugins/org.jboss.tools.common.text.ext/pom.xml
index 3493a38f9b..dffb6984ab 100644
--- a/common/plugins/org.jboss.tools.common.text.ext/pom.xml
+++ b/common/plugins/org.jboss.tools.common.text.ext/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.text.ext</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
index bfdfe20311..833a85e593 100644
--- a/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
@@ -30,6 +30,6 @@ Require-Bundle: org.jboss.tools.common,
  org.eclipse.wst.dtd.ui;bundle-version="1.0.600",
  org.junit;bundle-version="4.12.0",
  org.eclipse.ui.ide;bundle-version="3.7.0"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
diff --git a/common/plugins/org.jboss.tools.common.text.xml/pom.xml b/common/plugins/org.jboss.tools.common.text.xml/pom.xml
index 25b724e187..6ceb5139f0 100644
--- a/common/plugins/org.jboss.tools.common.text.xml/pom.xml
+++ b/common/plugins/org.jboss.tools.common.text.xml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.text.xml</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
index c529b3f849..eed6200f57 100644
--- a/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %Bundle-Name.0
 Bundle-Activator: org.jboss.tools.common.ui.CommonUIPlugin
 Bundle-SymbolicName: org.jboss.tools.common.ui;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Require-Bundle: org.eclipse.osgi;bundle-version="3.7.0",
  org.jboss.tools.common,
  org.eclipse.ui;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.ui/pom.xml b/common/plugins/org.jboss.tools.common.ui/pom.xml
index ab07617113..57d07b4d7c 100644
--- a/common/plugins/org.jboss.tools.common.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java b/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
index 59a5204882..8e6f113db1 100644
--- a/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
+++ b/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
@@ -304,19 +304,6 @@ protected IStatus superClassChanged() {
 		return result;
 	}
 
-	private void doStatusUpdate() {
-		// status of all used components
-		IStatus[] status = new IStatus[] {
-				fContainerStatus,
-				isEnclosingTypeSelected() ? fEnclosingTypeStatus
-						: fPackageStatus, fTypeNameStatus, fModifierStatus,
-				fSuperClassStatus, fSuperInterfacesStatus };
-
-		// the mode severe status will be displayed and the OK button
-		// enabled/disabled.
-		updateStatus(status);
-	}
-
 	protected void updateStatus(IStatus[] status) {
 		if(!CommonUIMessages.NEW_SERVICE_WIZARD_DESCRIPTION.equals(getDescription())) {
 			setDescription(CommonUIMessages.NEW_SERVICE_WIZARD_DESCRIPTION);
diff --git a/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF
index 73289e1703..43f2a8392f 100644
--- a/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.validation;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.validation.CommonValidationPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/common/plugins/org.jboss.tools.common.validation/pom.xml b/common/plugins/org.jboss.tools.common.validation/pom.xml
index fa9396045a..31c17ad2fb 100644
--- a/common/plugins/org.jboss.tools.common.validation/pom.xml
+++ b/common/plugins/org.jboss.tools.common.validation/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.validation</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
index b8413f356b..451699e44e 100644
--- a/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
@@ -30,5 +30,5 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.jface;bundle-version="3.7.0",
  org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
  org.eclipse.wst.validation;bundle-version="1.2.300"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/common/plugins/org.jboss.tools.common.verification.ui/pom.xml b/common/plugins/org.jboss.tools.common.verification.ui/pom.xml
index 3e19ae498a..38a8ad571c 100644
--- a/common/plugins/org.jboss.tools.common.verification.ui/pom.xml
+++ b/common/plugins/org.jboss.tools.common.verification.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.verification.ui</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF
index edabf8de4d..c5ab066dd7 100644
--- a/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Require-Bundle: org.jboss.tools.common,
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.wst.validation;bundle-version="1.2.300"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/common/plugins/org.jboss.tools.common.verification/pom.xml b/common/plugins/org.jboss.tools.common.verification/pom.xml
index 1c18a7a91f..20ba6536e1 100644
--- a/common/plugins/org.jboss.tools.common.verification/pom.xml
+++ b/common/plugins/org.jboss.tools.common.verification/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.verification</artifactId> 
diff --git a/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF b/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
index 554ec16245..ca98a8f0a8 100644
--- a/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
+++ b/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
@@ -28,15 +28,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.wst.xml.ui;bundle-version="1.1.500",
  org.apache.commons.io;bundle-version="2.6.0",
  org.apache.commons.lang3;bundle-version="3.1.0",
- org.apache.commons.compress;bundle-version="1.18.0",
+ org.apache.commons.commons-compress;bundle-version="1.23.0",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.9.9",
  com.fasterxml.jackson.core.jackson-core;bundle-version="2.9.9",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="2.9.93",
  org.apache.commons.exec;bundle-version="1.1.0",
- org.yaml.snakeyaml;bundle-version="1.21.0",
  org.apache.httpcomponents.httpclient;bundle-version="4.5.6",
  org.apache.httpcomponents.httpcore;bundle-version="4.4.10"
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/common/plugins/org.jboss.tools.common/pom.xml b/common/plugins/org.jboss.tools.common/pom.xml
index 1bc16f370a..36fcd4ee72 100644
--- a/common/plugins/org.jboss.tools.common/pom.xml
+++ b/common/plugins/org.jboss.tools.common/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common</artifactId> 
diff --git a/common/plugins/pom.xml b/common/plugins/pom.xml
index a32e373985..95b785f7a7 100644
--- a/common/plugins/pom.xml
+++ b/common/plugins/pom.xml
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>	
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>common</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/common/pom.xml b/common/pom.xml
index cb519108da..6beaf6fdab 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>common</artifactId>
 	<name>common.all</name>
-	<version>3.17.700-SNAPSHOT</version>
+	<version>3.18.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<enforceFailOnUIDependencyInCore>false</enforceFailOnUIDependencyInCore>
diff --git a/common/test-framework/org.jboss.tools.common.reddeer/META-INF/MANIFEST.MF b/common/test-framework/org.jboss.tools.common.reddeer/META-INF/MANIFEST.MF
index d7baf2e15c..8ed090baac 100644
--- a/common/test-framework/org.jboss.tools.common.reddeer/META-INF/MANIFEST.MF
+++ b/common/test-framework/org.jboss.tools.common.reddeer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RedDeer API for Common UI Tests
 Bundle-SymbolicName: org.jboss.tools.common.reddeer
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.jboss.tools.common.reddeer.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.reddeer.go;bundle-version="2.1.0",
diff --git a/common/test-framework/org.jboss.tools.common.reddeer/pom.xml b/common/test-framework/org.jboss.tools.common.reddeer/pom.xml
index 05eaf41981..d2b6d27885 100644
--- a/common/test-framework/org.jboss.tools.common.reddeer/pom.xml
+++ b/common/test-framework/org.jboss.tools.common.reddeer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>test-framework</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.test-framework</groupId>
 	<artifactId>org.jboss.tools.common.reddeer</artifactId>
diff --git a/common/test-framework/pom.xml b/common/test-framework/pom.xml
index 7b6b265dbd..9d02b1ff93 100644
--- a/common/test-framework/pom.xml
+++ b/common/test-framework/pom.xml
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>	
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>common</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>	
diff --git a/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
index 2a707e68ba..19b362d62d 100644
--- a/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
@@ -38,6 +38,6 @@ Require-Bundle: org.jboss.tools.common,
  org.eclipse.search;bundle-version="3.7.0",
  org.jboss.tools.common.ui,
  org.jboss.tools.common.model.ui
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
diff --git a/common/tests/org.jboss.tools.common.base.test/pom.xml b/common/tests/org.jboss.tools.common.base.test/pom.xml
index 6d8d407af2..1378da4e2b 100644
--- a/common/tests/org.jboss.tools.common.base.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.base.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.plugins</groupId>
 	<artifactId>org.jboss.tools.common.base.test</artifactId> 
diff --git a/common/tests/org.jboss.tools.common.core.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.core.test/META-INF/MANIFEST.MF
index e24ee65158..3e3a8516bd 100644
--- a/common/tests/org.jboss.tools.common.core.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.core.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.common.core.test
 Require-Bundle: 
diff --git a/common/tests/org.jboss.tools.common.core.test/pom.xml b/common/tests/org.jboss.tools.common.core.test/pom.xml
index 04033ceb9d..cba46e8166 100644
--- a/common/tests/org.jboss.tools.common.core.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.core.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.core.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF
index 07dce58d76..5eea55266e 100644
--- a/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.el.core.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.common.el.core.test
diff --git a/common/tests/org.jboss.tools.common.el.core.test/pom.xml b/common/tests/org.jboss.tools.common.el.core.test/pom.xml
index d3c670a7ab..dfb920a419 100644
--- a/common/tests/org.jboss.tools.common.el.core.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.el.core.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.el.core.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
index 046d6174d6..b799be5d64 100644
--- a/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.model.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.common.model.test,
  org.jboss.tools.common.model.util.test
diff --git a/common/tests/org.jboss.tools.common.model.test/pom.xml b/common/tests/org.jboss.tools.common.model.test/pom.xml
index 4f226cfc22..951d88cd8e 100644
--- a/common/tests/org.jboss.tools.common.model.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.model.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.model.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF
index 51ab155638..a76f26c397 100644
--- a/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.model.ui.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Require-Bundle: org.junit;bundle-version="4.12.0";visibility:=reexport,
  org.eclipse.jface,
  org.jboss.tools.tests,
diff --git a/common/tests/org.jboss.tools.common.model.ui.test/pom.xml b/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
index 03ada9b4cb..aafbf110cc 100644
--- a/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.model.ui.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.oauth.core.test/.classpath b/common/tests/org.jboss.tools.common.oauth.core.test/.classpath
index cc5ee2dc8c..81fe078c20 100644
--- a/common/tests/org.jboss.tools.common.oauth.core.test/.classpath
+++ b/common/tests/org.jboss.tools.common.oauth.core.test/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/common/tests/org.jboss.tools.common.oauth.core.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.oauth.core.test/META-INF/MANIFEST.MF
index 0fc816e0d9..c6936137fa 100644
--- a/common/tests/org.jboss.tools.common.oauth.core.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.oauth.core.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.oauth.core.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .
-Require-Bundle: org.junit.jupiter.api,
- org.jboss.tools.common.oauth.core;bundle-version="3.16.0"
+Require-Bundle: org.jboss.tools.common.oauth.core;bundle-version="3.16.0",
+ org.junit
diff --git a/common/tests/org.jboss.tools.common.oauth.core.test/build.properties b/common/tests/org.jboss.tools.common.oauth.core.test/build.properties
index 65bdfd07ea..5a2aea9e74 100644
--- a/common/tests/org.jboss.tools.common.oauth.core.test/build.properties
+++ b/common/tests/org.jboss.tools.common.oauth.core.test/build.properties
@@ -1,7 +1,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.properties
-src.includes = META-INF/,\
-               build.properties,\
-               src/
 source.. = src/
+output.. = bin/
diff --git a/common/tests/org.jboss.tools.common.oauth.core.test/pom.xml b/common/tests/org.jboss.tools.common.oauth.core.test/pom.xml
index 988580d37e..b3130360c1 100644
--- a/common/tests/org.jboss.tools.common.oauth.core.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.oauth.core.test/pom.xml
@@ -5,25 +5,24 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.oauth.core.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-
-    <build>
-          <plugins>
-             <plugin> 
-                 <groupId>org.eclipse.tycho</groupId>
-                 <artifactId>tycho-surefire-plugin</artifactId>
-                 <version>${tychoVersion}</version>
-                 <configuration>
-                     <includes>
-                         <include>**/*Test.class</include>
-                     </includes>
-                     <skip>${skipTests}</skip>
-                 </configuration>
-             </plugin>
-         </plugins>
-     </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tychoVersion}</version>
+				<configuration>
+					<includes>
+						<include>**/*Test.class</include>
+					</includes>
+					<useUIHarness>false</useUIHarness>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/common/tests/org.jboss.tools.common.oauth.core.test/src/org/jboss/tools/common/oauth/core/TokenProviderTest.java b/common/tests/org.jboss.tools.common.oauth.core.test/src/org/jboss/tools/common/oauth/core/TokenProviderTest.java
index 0ec6fb6b70..bad1522fd4 100644
--- a/common/tests/org.jboss.tools.common.oauth.core.test/src/org/jboss/tools/common/oauth/core/TokenProviderTest.java
+++ b/common/tests/org.jboss.tools.common.oauth.core.test/src/org/jboss/tools/common/oauth/core/TokenProviderTest.java
@@ -10,20 +10,16 @@
  ******************************************************************************/
 package org.jboss.tools.common.oauth.core;
 
-import org.junit.jupiter.api.Test;
+import junit.framework.TestCase;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 /**
  * @author Red Hat Developers
  *
  */
-public class TokenProviderTest {
-  
-  @Test
-  void verifyTokenProvider() {
-    assertNotNull(TokenProvider.get());
-  }
-
+public class TokenProviderTest extends TestCase {
 
+	public static void testVerifyTokenProvider() {
+		assertNotNull(TokenProvider.get());
+	}
 
 }
diff --git a/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF
index ec20c69091..d19e399689 100644
--- a/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.test
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/common/tests/org.jboss.tools.common.test/pom.xml b/common/tests/org.jboss.tools.common.test/pom.xml
index cc3b92673b..2f694a816e 100644
--- a/common/tests/org.jboss.tools.common.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF
index 7067e433f4..ba83f97523 100644
--- a/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.text.ext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.text.ext.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Require-Bundle: org.junit;bundle-version="4.12.0";visibility:=reexport,
  org.eclipse.wst.html.core,
  org.jboss.tools.common.text.ext;bundle-version="3.6.0",
diff --git a/common/tests/org.jboss.tools.common.text.ext.test/build.properties b/common/tests/org.jboss.tools.common.text.ext.test/build.properties
index 9b468f6b8c..f4ae970158 100644
--- a/common/tests/org.jboss.tools.common.text.ext.test/build.properties
+++ b/common/tests/org.jboss.tools.common.text.ext.test/build.properties
@@ -3,4 +3,3 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.properties
-source.. = src/
diff --git a/common/tests/org.jboss.tools.common.text.ext.test/pom.xml b/common/tests/org.jboss.tools.common.text.ext.test/pom.xml
index b8a01922ae..bb6a8469c3 100644
--- a/common/tests/org.jboss.tools.common.text.ext.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.text.ext.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.text.ext.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF
index b3675c006b..ad978125e9 100644
--- a/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.ui.test
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/common/tests/org.jboss.tools.common.ui.test/pom.xml b/common/tests/org.jboss.tools.common.ui.test/pom.xml
index 8fb5d96c2a..3c0ad82cd0 100644
--- a/common/tests/org.jboss.tools.common.ui.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.ui.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.ui.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF
index 5d74c905bd..dccd173ebc 100644
--- a/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Validation Test
 Bundle-SymbolicName: org.jboss.tools.common.validation.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.jboss.tools.tests,
diff --git a/common/tests/org.jboss.tools.common.validation.test/pom.xml b/common/tests/org.jboss.tools.common.validation.test/pom.xml
index 4f7a4d61ad..919504b2bb 100644
--- a/common/tests/org.jboss.tools.common.validation.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.validation.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.validation.test</artifactId> 
diff --git a/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF
index f85b2842e9..cab8c63373 100644
--- a/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.common.verification.test;singleton:=true
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.common.verification.test
diff --git a/common/tests/org.jboss.tools.common.verification.test/pom.xml b/common/tests/org.jboss.tools.common.verification.test/pom.xml
index 6d6a621346..3922752aec 100644
--- a/common/tests/org.jboss.tools.common.verification.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.verification.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.verification.test</artifactId>
diff --git a/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF b/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF
index 46f6f782d1..bfafa48a2f 100644
--- a/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF
+++ b/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-SymbolicName: org.jboss.tools.common.verification.ui.test
-Bundle-Version: 3.17.700.qualifier
+Bundle-Version: 3.18.0.qualifier
 Require-Bundle: org.junit,
  org.jboss.tools.tests,
  org.eclipse.jface,
diff --git a/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml b/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
index 2a1785929a..b159d035e0 100644
--- a/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
+++ b/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.common</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.common.tests</groupId>
 	<artifactId>org.jboss.tools.common.verification.ui.test</artifactId>
diff --git a/common/tests/pom.xml b/common/tests/pom.xml
index fcd28eb097..e565a31c74 100644
--- a/common/tests/pom.xml
+++ b/common/tests/pom.xml
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>	
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>common</artifactId>
-		<version>3.17.700-SNAPSHOT</version>
+		<version>3.18.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
diff --git a/foundation/plugins/org.jboss.tools.foundation.ui/.classpath b/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
index a7dfbacfbf..b8c63f71f2 100644
--- a/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
+++ b/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/magicfile4j-1.0.0-Beta1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/magicfile4j-1.0.0-Beta1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/foundation/plugins/org.jboss.tools.foundation.ui/.project b/foundation/plugins/org.jboss.tools.foundation.ui/.project
index 9b5b1137b4..60beae749b 100644
--- a/foundation/plugins/org.jboss.tools.foundation.ui/.project
+++ b/foundation/plugins/org.jboss.tools.foundation.ui/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml
index b6e9bc528c..15e632862e 100644
--- a/jacoco-report/pom.xml
+++ b/jacoco-report/pom.xml
@@ -15,12 +15,12 @@
 	<properties>
 		<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 		<enforceExcludePatternExtras>|plugins.version.*</enforceExcludePatternExtras>
-		<plugins.version.common>3.17.700-SNAPSHOT</plugins.version.common>
+		<plugins.version.common>3.18.0-SNAPSHOT</plugins.version.common>
 		<plugins.version.foundation>1.6.1800-SNAPSHOT</plugins.version.foundation>
-		<plugins.version.runtime>3.5.300-SNAPSHOT</plugins.version.runtime>
-		<plugins.version.stacks>1.4.200-SNAPSHOT</plugins.version.stacks>
+		<plugins.version.runtime>3.5.400-SNAPSHOT</plugins.version.runtime>
+		<plugins.version.stacks>1.4.300-SNAPSHOT</plugins.version.stacks>
 		<plugins.version.tests>3.7.103-SNAPSHOT</plugins.version.tests>
-		<plugins.version.usage>2.3.0-SNAPSHOT</plugins.version.usage>
+		<plugins.version.usage>2.3.100-SNAPSHOT</plugins.version.usage>
 	</properties>
 
 	<build>
diff --git a/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml b/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml
index 5ada179c86..b2317dfe4d 100644
--- a/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml
+++ b/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.runtime.core.feature"
       label="%featureName"
-      version="3.5.300.qualifier"
+      version="3.5.400.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.runtime.core"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml b/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml
index e46e84523c..bfd4fe848b 100644
--- a/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml
+++ b/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>features</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime.features</groupId>
 	<artifactId>org.jboss.tools.runtime.core.feature</artifactId>
diff --git a/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml b/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml
index 881e1d0aa6..8a29821135 100644
--- a/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml
+++ b/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.runtime.test.feature"
       label="%featureName"
-      version="3.5.300.qualifier"
+      version="3.5.400.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml b/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml
index 6b42790855..bfd5fd2d38 100644
--- a/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml
+++ b/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>features</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime.features</groupId>
 	<artifactId>org.jboss.tools.runtime.test.feature</artifactId>
diff --git a/runtime/features/pom.xml b/runtime/features/pom.xml
index a42ca1c596..af68908476 100644
--- a/runtime/features/pom.xml
+++ b/runtime/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>runtime</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime</groupId>
 	<artifactId>features</artifactId>
diff --git a/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF b/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF
index 6f964056e5..8541a1cd97 100644
--- a/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF
+++ b/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.runtime.core;singleton:=true
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.400.qualifier
 Bundle-Activator: org.jboss.tools.runtime.core.RuntimeCoreActivator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.jboss.tools.foundation.core;bundle-version="1.1.0",
  org.eclipse.debug.core,
  org.eclipse.jdt.launching,
- org.apache.commons.compress;bundle-version="1.6.0"
+ org.apache.commons.commons-compress;bundle-version="1.23.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %BundleVendor
diff --git a/runtime/plugins/org.jboss.tools.runtime.core/pom.xml b/runtime/plugins/org.jboss.tools.runtime.core/pom.xml
index c0ab3e3ebf..6afc397544 100644
--- a/runtime/plugins/org.jboss.tools.runtime.core/pom.xml
+++ b/runtime/plugins/org.jboss.tools.runtime.core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime.plugins</groupId>
 	<artifactId>org.jboss.tools.runtime.core</artifactId>
diff --git a/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF b/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF
index 4b577c0b31..56485921d9 100644
--- a/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF
+++ b/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.runtime.ui;singleton:=true
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.400.qualifier
 Bundle-Activator: org.jboss.tools.runtime.ui.RuntimeUIActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml b/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml
index 4caf9f224f..0f8aef57e0 100644
--- a/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml
+++ b/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime.plugins</groupId>
 	<artifactId>org.jboss.tools.runtime.ui</artifactId>
diff --git a/runtime/plugins/pom.xml b/runtime/plugins/pom.xml
index d55c7e4e38..ddcf4b1712 100644
--- a/runtime/plugins/pom.xml
+++ b/runtime/plugins/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>runtime</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index a6537a4acd..d91359ff64 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>runtime</artifactId>
-	<version>3.5.300-SNAPSHOT</version>
+	<version>3.5.400-SNAPSHOT</version>
 	<name>runtime.all</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/runtime/test-framework/org.jboss.tools.runtime.reddeer/META-INF/MANIFEST.MF b/runtime/test-framework/org.jboss.tools.runtime.reddeer/META-INF/MANIFEST.MF
index 8598a802d8..c9a8346547 100644
--- a/runtime/test-framework/org.jboss.tools.runtime.reddeer/META-INF/MANIFEST.MF
+++ b/runtime/test-framework/org.jboss.tools.runtime.reddeer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Runtime Reddeer
 Bundle-SymbolicName: org.jboss.tools.runtime.reddeer
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.400.qualifier
 Bundle-Activator: org.jboss.tools.runtime.reddeer.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/runtime/test-framework/org.jboss.tools.runtime.reddeer/pom.xml b/runtime/test-framework/org.jboss.tools.runtime.reddeer/pom.xml
index 84d11cdf40..584cdc8315 100644
--- a/runtime/test-framework/org.jboss.tools.runtime.reddeer/pom.xml
+++ b/runtime/test-framework/org.jboss.tools.runtime.reddeer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>test-framework</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime</groupId>
 	<artifactId>org.jboss.tools.runtime.reddeer</artifactId>
diff --git a/runtime/test-framework/pom.xml b/runtime/test-framework/pom.xml
index b8a4443f68..22d637c204 100644
--- a/runtime/test-framework/pom.xml
+++ b/runtime/test-framework/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>runtime</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime</groupId>
 	<artifactId>test-framework</artifactId>
-	<version>3.5.300-SNAPSHOT</version>
+	<version>3.5.400-SNAPSHOT</version>
 	<name>runtime.test-framework</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF b/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF
index 91d4b65299..fad4e1a2ce 100644
--- a/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.runtime.test;singleton:=true
 Bundle-Activator: org.jboss.tools.runtime.test.RuntimeTestActivator
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.400.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
  org.jboss.tools.runtime.ui,
diff --git a/runtime/tests/org.jboss.tools.runtime.test/pom.xml b/runtime/tests/org.jboss.tools.runtime.test/pom.xml
index e27c970784..525ae0f28c 100644
--- a/runtime/tests/org.jboss.tools.runtime.test/pom.xml
+++ b/runtime/tests/org.jboss.tools.runtime.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.runtime</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime.tests</groupId>
 	<artifactId>org.jboss.tools.runtime.test</artifactId>
diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml
index 52aa70d14e..78f97d980e 100644
--- a/runtime/tests/pom.xml
+++ b/runtime/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>runtime</artifactId>
-		<version>3.5.300-SNAPSHOT</version>
+		<version>3.5.400-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.runtime</groupId>
 	<artifactId>tests</artifactId>
diff --git a/stacks/features/org.jboss.tools.stacks.core.feature/feature.xml b/stacks/features/org.jboss.tools.stacks.core.feature/feature.xml
index ea56800955..a1f0165652 100644
--- a/stacks/features/org.jboss.tools.stacks.core.feature/feature.xml
+++ b/stacks/features/org.jboss.tools.stacks.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.stacks.core.feature"
       label="%featureName"
-      version="1.4.200.qualifier"
+      version="1.4.300.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.stacks.core"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/stacks/features/org.jboss.tools.stacks.core.feature/pom.xml b/stacks/features/org.jboss.tools.stacks.core.feature/pom.xml
index 5cf23a709d..7b60034082 100644
--- a/stacks/features/org.jboss.tools.stacks.core.feature/pom.xml
+++ b/stacks/features/org.jboss.tools.stacks.core.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.stacks</groupId>
 		<artifactId>features</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks.features</groupId>
 	<artifactId>org.jboss.tools.stacks.core.feature</artifactId> 
diff --git a/stacks/features/org.jboss.tools.stacks.core.test.feature/feature.xml b/stacks/features/org.jboss.tools.stacks.core.test.feature/feature.xml
index f58274d585..84c2847aed 100644
--- a/stacks/features/org.jboss.tools.stacks.core.test.feature/feature.xml
+++ b/stacks/features/org.jboss.tools.stacks.core.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.stacks.core.test.feature"
       label="%featureName"
-      version="1.4.200.qualifier"
+      version="1.4.300.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/stacks/features/org.jboss.tools.stacks.core.test.feature/pom.xml b/stacks/features/org.jboss.tools.stacks.core.test.feature/pom.xml
index d0776a9836..75ec626c65 100644
--- a/stacks/features/org.jboss.tools.stacks.core.test.feature/pom.xml
+++ b/stacks/features/org.jboss.tools.stacks.core.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.stacks</groupId>
 		<artifactId>features</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks.features</groupId>
 	<artifactId>org.jboss.tools.stacks.core.test.feature</artifactId> 
diff --git a/stacks/features/pom.xml b/stacks/features/pom.xml
index 14ab443646..270a6c7f53 100644
--- a/stacks/features/pom.xml
+++ b/stacks/features/pom.xml
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>	
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>stacks</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/stacks/plugins/org.jboss.tools.stacks.core/.classpath b/stacks/plugins/org.jboss.tools.stacks.core/.classpath
index 2c1cbdac6c..d08cd1f970 100644
--- a/stacks/plugins/org.jboss.tools.stacks.core/.classpath
+++ b/stacks/plugins/org.jboss.tools.stacks.core/.classpath
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.2.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.10.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/stacks-client-1.0.3.Final.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/stacks/plugins/org.jboss.tools.stacks.core/META-INF/MANIFEST.MF b/stacks/plugins/org.jboss.tools.stacks.core/META-INF/MANIFEST.MF
index 687f999360..a879ea4c82 100644
--- a/stacks/plugins/org.jboss.tools.stacks.core/META-INF/MANIFEST.MF
+++ b/stacks/plugins/org.jboss.tools.stacks.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-SymbolicName: org.jboss.tools.stacks.core
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.300.qualifier
 Bundle-Activator: org.jboss.tools.stacks.core.StacksCoreActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.security;bundle-version="1.1.100",
diff --git a/stacks/plugins/org.jboss.tools.stacks.core/pom.xml b/stacks/plugins/org.jboss.tools.stacks.core/pom.xml
index a46a538b28..290f241362 100644
--- a/stacks/plugins/org.jboss.tools.stacks.core/pom.xml
+++ b/stacks/plugins/org.jboss.tools.stacks.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.stacks</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks.plugins</groupId>
 	<artifactId>org.jboss.tools.stacks.core</artifactId> 
diff --git a/stacks/plugins/pom.xml b/stacks/plugins/pom.xml
index bd9376e679..fe67de12b3 100644
--- a/stacks/plugins/pom.xml
+++ b/stacks/plugins/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>stacks</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/stacks/pom.xml b/stacks/pom.xml
index 229653b3a3..e5cbccb1a1 100644
--- a/stacks/pom.xml
+++ b/stacks/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>stacks</artifactId>
-	<version>1.4.200-SNAPSHOT</version>
+	<version>1.4.300-SNAPSHOT</version>
 	<name>stacks.all</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/stacks/tests/org.jboss.tools.stacks.core.test/META-INF/MANIFEST.MF b/stacks/tests/org.jboss.tools.stacks.core.test/META-INF/MANIFEST.MF
index 106751b592..6caa5d9e71 100644
--- a/stacks/tests/org.jboss.tools.stacks.core.test/META-INF/MANIFEST.MF
+++ b/stacks/tests/org.jboss.tools.stacks.core.test/META-INF/MANIFEST.MF
@@ -3,13 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.stacks.core.test;singleton:=true
 Bundle-Activator: org.jboss.tools.stacks.core.test.StacksCoreTestActivator
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.300.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
  org.jboss.tools.tests,
  org.jboss.tools.common,
- org.jboss.tools.stacks.core;bundle-version="1.0.0",
- javax.annotation
+ org.jboss.tools.stacks.core;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %BundleVendor
diff --git a/stacks/tests/org.jboss.tools.stacks.core.test/pom.xml b/stacks/tests/org.jboss.tools.stacks.core.test/pom.xml
index 949ad68a59..120fe2ffb9 100644
--- a/stacks/tests/org.jboss.tools.stacks.core.test/pom.xml
+++ b/stacks/tests/org.jboss.tools.stacks.core.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.stacks</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks.tests</groupId>
 	<artifactId>org.jboss.tools.stacks.core.test</artifactId>
diff --git a/stacks/tests/pom.xml b/stacks/tests/pom.xml
index bfdb84557f..7a5fcdb396 100644
--- a/stacks/tests/pom.xml
+++ b/stacks/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>stacks</artifactId>
-		<version>1.4.200-SNAPSHOT</version>
+		<version>1.4.300-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.stacks</groupId>
 	<artifactId>tests</artifactId>
diff --git a/usage/features/org.jboss.tools.usage.feature/feature.xml b/usage/features/org.jboss.tools.usage.feature/feature.xml
index 2736eed41f..4748d547eb 100644
--- a/usage/features/org.jboss.tools.usage.feature/feature.xml
+++ b/usage/features/org.jboss.tools.usage.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.usage.feature"
       label="%featureName"
-      version="2.3.0.qualifier"
+      version="2.3.100.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.usage"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/usage/features/org.jboss.tools.usage.feature/pom.xml b/usage/features/org.jboss.tools.usage.feature/pom.xml
index 7effe34946..6a72b72b38 100644
--- a/usage/features/org.jboss.tools.usage.feature/pom.xml
+++ b/usage/features/org.jboss.tools.usage.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.usage</groupId>
 		<artifactId>features</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage.features</groupId>
 	<artifactId>org.jboss.tools.usage.feature</artifactId>
diff --git a/usage/features/org.jboss.tools.usage.test.feature/feature.xml b/usage/features/org.jboss.tools.usage.test.feature/feature.xml
index 477853eb71..7c1f03b451 100644
--- a/usage/features/org.jboss.tools.usage.test.feature/feature.xml
+++ b/usage/features/org.jboss.tools.usage.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.usage.test.feature"
       label="%featureName"
-      version="2.3.0.qualifier"
+      version="2.3.100.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/usage/features/org.jboss.tools.usage.test.feature/pom.xml b/usage/features/org.jboss.tools.usage.test.feature/pom.xml
index 79a7689bba..b8270e2008 100644
--- a/usage/features/org.jboss.tools.usage.test.feature/pom.xml
+++ b/usage/features/org.jboss.tools.usage.test.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.usage</groupId>
 		<artifactId>features</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage.features</groupId>
 	<artifactId>org.jboss.tools.usage.test.feature</artifactId>
diff --git a/usage/features/pom.xml b/usage/features/pom.xml
index dc73df73ef..e6ff7621bb 100644
--- a/usage/features/pom.xml
+++ b/usage/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>usage</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage</groupId>
 	<artifactId>features</artifactId>
diff --git a/usage/plugins/org.jboss.tools.usage/.gitignore b/usage/plugins/org.jboss.tools.usage/.gitignore
new file mode 100644
index 0000000000..12c18d4ede
--- /dev/null
+++ b/usage/plugins/org.jboss.tools.usage/.gitignore
@@ -0,0 +1 @@
+/lib/
diff --git a/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF b/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
index a88c253a9c..ceb57969e8 100644
--- a/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
+++ b/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle-name
 Bundle-SymbolicName: org.jboss.tools.usage;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.jboss.tools.usage.branding,
  org.jboss.tools.usage.event,
diff --git a/usage/plugins/org.jboss.tools.usage/pom.xml b/usage/plugins/org.jboss.tools.usage/pom.xml
index 29db7bb185..ab2fa0731d 100644
--- a/usage/plugins/org.jboss.tools.usage/pom.xml
+++ b/usage/plugins/org.jboss.tools.usage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.usage</groupId>
 		<artifactId>plugins</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage.plugins</groupId>
 	<artifactId>org.jboss.tools.usage</artifactId>
diff --git a/usage/plugins/pom.xml b/usage/plugins/pom.xml
index 655260a230..c704e8feee 100644
--- a/usage/plugins/pom.xml
+++ b/usage/plugins/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>usage</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>	
 	<groupId>org.jboss.tools.usage</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/usage/pom.xml b/usage/pom.xml
index cdac303cc4..443f4148ab 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>usage</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.3.100-SNAPSHOT</version>
 	<name>usage.all</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF b/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
index a94ed34ed7..103de99326 100644
--- a/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
+++ b/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.jboss.tools.usage.test
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0",
  org.eclipse.osgi;bundle-version="3.5.2",
diff --git a/usage/tests/org.jboss.tools.usage.test/pom.xml b/usage/tests/org.jboss.tools.usage.test/pom.xml
index d292864ada..10d4aaa990 100644
--- a/usage/tests/org.jboss.tools.usage.test/pom.xml
+++ b/usage/tests/org.jboss.tools.usage.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.usage</groupId>
 		<artifactId>tests</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage.tests</groupId>
 	<artifactId>org.jboss.tools.usage.test</artifactId>
diff --git a/usage/tests/pom.xml b/usage/tests/pom.xml
index 9f12cfeb19..8968287ccc 100644
--- a/usage/tests/pom.xml
+++ b/usage/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>usage</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.100-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.usage</groupId>
 	<artifactId>tests</artifactId>