diff --git a/cdi/features/org.jboss.tools.cdi.deltaspike.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.deltaspike.feature/feature.xml
index 58b86aec33..0ae75fc86b 100644
--- a/cdi/features/org.jboss.tools.cdi.deltaspike.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.deltaspike.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.deltaspike.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.deltaspike.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	plugin="org.jboss.tools.cdi.deltaspike.core"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
diff --git a/cdi/features/org.jboss.tools.cdi.deltaspike.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.deltaspike.feature/pom.xml
index b24a226a66..7b391f7dab 100644
--- a/cdi/features/org.jboss.tools.cdi.deltaspike.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.deltaspike.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.deltaspike.feature</artifactId> 
diff --git a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
index cf9658bb8a..283b01eec7 100644
--- a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.deltaspike.test.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.deltaspike.test.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/pom.xml
index 49ae99f35c..1d16b12e74 100644
--- a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.deltaspike.test.feature</artifactId>
diff --git a/cdi/features/org.jboss.tools.cdi.faces.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.faces.feature/feature.xml
index a6e4b07d8e..aac4c2f59b 100644
--- a/cdi/features/org.jboss.tools.cdi.faces.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.faces.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.faces.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.faces.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	plugin="org.jboss.tools.cdi.faces.core"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
diff --git a/cdi/features/org.jboss.tools.cdi.faces.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.faces.feature/pom.xml
index c893a5e18c..e398134d86 100644
--- a/cdi/features/org.jboss.tools.cdi.faces.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.faces.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.faces.feature</artifactId> 
diff --git a/cdi/features/org.jboss.tools.cdi.faces.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.faces.test.feature/feature.xml
index f43bd06844..7f1ee3c509 100644
--- a/cdi/features/org.jboss.tools.cdi.faces.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.faces.test.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.faces.test.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.faces.test.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/cdi/features/org.jboss.tools.cdi.faces.test.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.faces.test.feature/pom.xml
index 091ab60b50..d1631ec7d0 100644
--- a/cdi/features/org.jboss.tools.cdi.faces.test.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.faces.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.faces.test.feature</artifactId>
diff --git a/cdi/features/org.jboss.tools.cdi.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.feature/feature.xml
index fa304bdc93..8fad693d42 100644
--- a/cdi/features/org.jboss.tools.cdi.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider" plugin="org.jboss.tools.cdi.ui"
+<feature id="org.jboss.tools.cdi.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider" plugin="org.jboss.tools.cdi.ui"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/cdi/features/org.jboss.tools.cdi.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.feature/pom.xml
index 364acc924e..3cd387954a 100644
--- a/cdi/features/org.jboss.tools.cdi.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.feature</artifactId> 
diff --git a/cdi/features/org.jboss.tools.cdi.microprofile.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.microprofile.feature/feature.xml
index 707e5e4114..5c9646f722 100644
--- a/cdi/features/org.jboss.tools.cdi.microprofile.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.microprofile.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.microprofile.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.microprofile.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	plugin="org.jboss.tools.cdi.microprofile.core"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
diff --git a/cdi/features/org.jboss.tools.cdi.microprofile.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.microprofile.feature/pom.xml
index fbda445836..056ae812eb 100644
--- a/cdi/features/org.jboss.tools.cdi.microprofile.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.microprofile.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.microprofile.feature</artifactId> 
diff --git a/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/feature.xml
index 1e5816d6cf..35aec87777 100644
--- a/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.microprofile.test.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.microprofile.test.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/pom.xml
index 261156393a..4f61d32d71 100644
--- a/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.microprofile.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.microprofile.test.feature</artifactId>
diff --git a/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
index dcf4891064..b3026392c0 100644
--- a/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.test.feature" label="%featureName" version="1.10.501.qualifier" provider-name="%featureProvider"
+<feature id="org.jboss.tools.cdi.test.feature" label="%featureName" version="1.10.600.qualifier" provider-name="%featureProvider"
 	license-feature="org.jboss.tools.foundation.license.feature"
 	license-feature-version="0.0.0">
 
diff --git a/cdi/features/org.jboss.tools.cdi.test.feature/pom.xml b/cdi/features/org.jboss.tools.cdi.test.feature/pom.xml
index b61eb62d4f..d2f2f5d3fd 100644
--- a/cdi/features/org.jboss.tools.cdi.test.feature/pom.xml
+++ b/cdi/features/org.jboss.tools.cdi.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>features</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.features</groupId>
 	<artifactId>org.jboss.tools.cdi.test.feature</artifactId>
diff --git a/cdi/features/pom.xml b/cdi/features/pom.xml
index d7c0fb9a1e..f3de11b4ee 100644
--- a/cdi/features/pom.xml
+++ b/cdi/features/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>cdi</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi</groupId>
 	<artifactId>features</artifactId>
diff --git a/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
index f15970c3ac..78e638f0c7 100644
--- a/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Contexts and Dependency Injection Core
 Bundle-SymbolicName: org.jboss.tools.cdi.core;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
diff --git a/cdi/plugins/org.jboss.tools.cdi.core/pom.xml b/cdi/plugins/org.jboss.tools.cdi.core/pom.xml
index eefe4625cc..c44f5b3d69 100644
--- a/cdi/plugins/org.jboss.tools.cdi.core/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.core</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF
index fb38d654af..0132260295 100644
--- a/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deltaspike Core
 Bundle-SymbolicName: org.jboss.tools.cdi.deltaspike.core;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Activator: org.jboss.tools.cdi.deltaspike.core.DeltaspikeCorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
diff --git a/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/pom.xml b/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/pom.xml
index fc5c7b7a9a..050870c65f 100644
--- a/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.deltaspike.core</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.extension.core/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.extension.core/META-INF/MANIFEST.MF
index aa4100a8e8..fcc6479f51 100644
--- a/cdi/plugins/org.jboss.tools.cdi.extension.core/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.extension.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDI Extension Core
 Bundle-SymbolicName: org.jboss.tools.cdi.extension.core;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Activator: org.jboss.tools.cdi.extension.internal.core.CDIExtensionCorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
diff --git a/cdi/plugins/org.jboss.tools.cdi.extension.core/pom.xml b/cdi/plugins/org.jboss.tools.cdi.extension.core/pom.xml
index b15257fd22..2f30360d71 100644
--- a/cdi/plugins/org.jboss.tools.cdi.extension.core/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.extension.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.extension.core</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.faces.core/.classpath b/cdi/plugins/org.jboss.tools.cdi.faces.core/.classpath
index 751c8f2e50..edc8895124 100644
--- a/cdi/plugins/org.jboss.tools.cdi.faces.core/.classpath
+++ b/cdi/plugins/org.jboss.tools.cdi.faces.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<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="output" path="bin"/>
 </classpath>
diff --git a/cdi/plugins/org.jboss.tools.cdi.faces.core/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.faces.core/META-INF/MANIFEST.MF
index 515f161654..b68bec89d3 100644
--- a/cdi/plugins/org.jboss.tools.cdi.faces.core/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.faces.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse MicroProfile Core
 Bundle-SymbolicName: org.jboss.tools.cdi.faces.core;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/cdi/plugins/org.jboss.tools.cdi.faces.core/pom.xml b/cdi/plugins/org.jboss.tools.cdi.faces.core/pom.xml
index f7c810a6dc..9a76dfbbc8 100644
--- a/cdi/plugins/org.jboss.tools.cdi.faces.core/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.faces.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.faces.core</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/.classpath b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/.classpath
index e801ebfb46..edc8895124 100644
--- a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/.classpath
+++ b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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="src" path="src/"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/META-INF/MANIFEST.MF
index 771c3bcf33..16fbced3ef 100644
--- a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse MicroProfile Core
 Bundle-SymbolicName: org.jboss.tools.cdi.microprofile.core;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/pom.xml b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/pom.xml
index eeeb00a086..8b129f9615 100644
--- a/cdi/plugins/org.jboss.tools.cdi.microprofile.core/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.microprofile.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.microprofile.core</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
index 936851790b..a41204a99b 100644
--- a/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.jboss.tools.common.el.core,
  org.jboss.tools.common.model,
  org.jboss.tools.cdi.ui
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml b/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml
index 63dbd7fc44..267d40267f 100644
--- a/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.text.ext</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
index ad2dd8fbf1..699147b753 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.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.cdi.ui;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Activator: org.jboss.tools.cdi.ui.CDIUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml b/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml
index bfcc7949b4..9873288038 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.ui</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
index 089b260106..c959ac7efc 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
+++ b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
@@ -353,32 +353,11 @@ protected IStatus superInterfacesChanged() {
 		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) {
-//		IStatus[] ns = new IStatus[status.length + 1];
-//		System.arraycopy(status, 0, ns, 0, status.length);
-//		ns[status.length] = qualifierStatus;
-//		status = ns;
 		updateStatus(StatusUtil.getMostSevere(status));
 	}
 	
 	void onQualifiersChange() {
-//		qualifierStatus = new StatusInfo();
-//		if(((List)qualifiers.getValue()).isEmpty()) {
-//			qualifierStatus.setWarning(CDIUIMessages.MESSAGE_QUALIFIER_NOT_SET);
-//		}
 	}
 
 	public IFieldEditor createQualifierCompositeEditor(String name, String label, String defaultValue) {
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
index dee8ca5abf..1aa17ad68b 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
+++ b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
@@ -266,19 +266,6 @@ protected void createCustomFields(Composite composite) {
 		createQualifiersField(composite);
 	}
 
-	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) {
 		IStatus[] ns = new IStatus[status.length + 2];
 		System.arraycopy(status, 0, ns, 0, status.length);
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
index 630e0e333f..0b1ec98cd1 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
+++ b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
@@ -366,19 +366,6 @@ protected IStatus superInterfacesChanged() {
 		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(!CDIUIMessages.NEW_DECORATOR_WIZARD_DESCRIPTION.equals(getDescription())) {
 			setDescription(CDIUIMessages.NEW_DECORATOR_WIZARD_DESCRIPTION);
diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
index b3066d01f9..07b9b702e8 100644
--- a/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
+++ b/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java
@@ -297,21 +297,6 @@ void editMethod(ICompilationUnit cu, IMethod m, String methodHeader, String meth
 	}
 	
 
-	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) {
 		IStatus[] ns = new IStatus[status.length + 2];
 		System.arraycopy(status, 0, ns, 0, status.length);
diff --git a/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
index e92f587533..43ffb4d84b 100644
--- a/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
@@ -31,6 +31,6 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
  org.jboss.tools.jst.web.ui,
  org.jboss.tools.cdi.xml,
  org.jboss.tools.cdi.ui
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ManifestVersion: 2
diff --git a/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml b/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml
index d24507a273..1e1cefe54f 100644
--- a/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.xml.ui</artifactId> 
diff --git a/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
index 436c2b6aaa..1da6d9e019 100644
--- a/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
+++ b/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
@@ -26,5 +26,5 @@ Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.wst.web;bundle-version="1.1.500"
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml b/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml
index 8acde99b7c..51bb6a5a8d 100644
--- a/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml
+++ b/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.plugins</groupId>
 	<artifactId>org.jboss.tools.cdi.xml</artifactId> 
diff --git a/cdi/plugins/pom.xml b/cdi/plugins/pom.xml
index a819006460..15b4d11460 100644
--- a/cdi/plugins/pom.xml
+++ b/cdi/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>cdi</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/cdi/pom.xml b/cdi/pom.xml
index f92e4e8422..55f82fbcd2 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -6,10 +6,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<artifactId>javaee.all</artifactId>
 		<version>4.4.3-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
 	<artifactId>cdi</artifactId>
 	<name>cdi.all</name>
-	<version>1.10.501-SNAPSHOT</version>
+	<version>1.10.600-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>plugins</module>
diff --git a/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
index 67817371cf..a57edb62ec 100644
--- a/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Contexts and Dependency Injection Test
 Bundle-SymbolicName: org.jboss.tools.cdi.core.test;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.jboss.tools.tests,
diff --git a/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
index 181020a54e..ce74105d12 100644
--- a/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.core.test</artifactId> 
diff --git a/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF
index d39a4e8a70..d6fa541cbe 100644
--- a/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deltaspike Core Test
 Bundle-SymbolicName: org.jboss.tools.cdi.deltaspike.core.test;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.jdt.core,
diff --git a/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/pom.xml
index 0b7ef7a3ae..07fa4336bc 100644
--- a/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.deltaspike.core.test</artifactId>
diff --git a/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF
index fc07db9fb3..b55c5ed5bc 100644
--- a/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deltaspike Core Test
 Bundle-SymbolicName: org.jboss.tools.cdi.extension.core.test;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.jdt.core,
diff --git a/cdi/tests/org.jboss.tools.cdi.extension.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.extension.core.test/pom.xml
index 9eb6580746..6ca5ec48d4 100644
--- a/cdi/tests/org.jboss.tools.cdi.extension.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.extension.core.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.extension.core.test</artifactId>
diff --git a/cdi/tests/org.jboss.tools.cdi.faces.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.faces.core.test/META-INF/MANIFEST.MF
index b234024bb7..937a0d985d 100644
--- a/cdi/tests/org.jboss.tools.cdi.faces.core.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.faces.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse MicroProfile Core Test
 Bundle-SymbolicName: org.jboss.tools.cdi.faces.core.test;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.jboss.tools.tests,
diff --git a/cdi/tests/org.jboss.tools.cdi.faces.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.faces.core.test/pom.xml
index 923b39f135..0a1c0a79ab 100644
--- a/cdi/tests/org.jboss.tools.cdi.faces.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.faces.core.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.faces.core.test</artifactId>
diff --git a/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/META-INF/MANIFEST.MF
index 0ac402b3f6..5ed69ce9f1 100644
--- a/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse MicroProfile Core Test
 Bundle-SymbolicName: org.jboss.tools.cdi.microprofile.core.test;singleton:=true
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.jboss.tools.tests,
diff --git a/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/pom.xml
index b492d211c6..4293167424 100644
--- a/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.microprofile.core.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.microprofile.core.test</artifactId>
diff --git a/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
index e2c54789f4..bdafb9bb67 100644
--- a/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.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.cdi.text.ext.test
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.jface.text;bundle-version="3.5.0",
diff --git a/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
index 72f2be4fff..2bea0752fb 100644
--- a/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.text.ext.test</artifactId> 
diff --git a/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
index d7e6d37bf8..da07c839e8 100644
--- a/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Contexts and Dependency Injection UI Test
 Bundle-SymbolicName: org.jboss.tools.cdi.ui.test
-Bundle-Version: 1.10.501.qualifier
+Bundle-Version: 1.10.600.qualifier
 Bundle-Vendor: Red Hat
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit,
diff --git a/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
index 428d55f87e..e1acce9e9c 100644
--- a/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.cdi</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.ui.test</artifactId> 
diff --git a/cdi/tests/pom.xml b/cdi/tests/pom.xml
index 4102025261..29a81dfabe 100644
--- a/cdi/tests/pom.xml
+++ b/cdi/tests/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>cdi</artifactId>
-		<version>1.10.501-SNAPSHOT</version>
+		<version>1.10.600-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.cdi</groupId>
 	<artifactId>tests</artifactId>
diff --git a/pom.xml b/pom.xml
index 48f8215a09..8607ad1117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,10 +15,7 @@
  		<tycho.scmUrl>scm:git:https://github.com/jbosstools/jbosstools-javaee.git</tycho.scmUrl>
  	</properties>
 	<modules>
-		<module>batch</module>
 		<module>cdi</module>
-		<!-- <module>jsf</module>
-		<module>seam</module> -->
 		<module>site</module>
 	</modules>
 	<repositories>
diff --git a/site/category.xml b/site/category.xml
index e584fc5879..abd1af2d36 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -63,21 +63,5 @@
 		<category name="AllSources"/>
 	</feature>
 	
-<!-- batch -->
-
-	<feature url="features/org.jboss.tools.batch.feature_0.0.0.jar" id="org.jboss.tools.batch.feature" version="0.0.0">
-		<category name="AllFeatures"/>
-	</feature>
-	<feature url="features/org.jboss.tools.batch.test.feature_0.0.0.jar" id="org.jboss.tools.batch.test.feature" version="0.0.0">
-		<category name="AllFeatures"/>
-	</feature>
-
-	<!-- Sources -->
-	<feature url="features/org.jboss.tools.batch.feature.source_0.0.0.jar" id="org.jboss.tools.batch.feature.source" version="0.0.0">
-		<category name="AllSources"/>
-	</feature>
-	<feature url="features/org.jboss.tools.batch.test.feature.source_0.0.0.jar" id="org.jboss.tools.batch.test.feature.source" version="0.0.0">
-		<category name="AllSources"/>
-	</feature>
 </site>