diff --git a/foundation/features/org.jboss.tools.foundation.feature/feature.xml b/foundation/features/org.jboss.tools.foundation.feature/feature.xml
index 8f56535b1..5386a933c 100644
--- a/foundation/features/org.jboss.tools.foundation.feature/feature.xml
+++ b/foundation/features/org.jboss.tools.foundation.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.foundation.feature"
       label="%featureName"
-      version="1.6.1800.qualifier"
+      version="1.6.1900.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.foundation.ui"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/foundation/features/org.jboss.tools.foundation.feature/pom.xml b/foundation/features/org.jboss.tools.foundation.feature/pom.xml
index cffdb48c9..a4f9b4344 100644
--- a/foundation/features/org.jboss.tools.foundation.feature/pom.xml
+++ b/foundation/features/org.jboss.tools.foundation.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>features</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.features</groupId>
 	<artifactId>org.jboss.tools.foundation.feature</artifactId> 
diff --git a/foundation/features/org.jboss.tools.foundation.license.feature/feature.xml b/foundation/features/org.jboss.tools.foundation.license.feature/feature.xml
index 4fd6cd228..c7c28eff0 100644
--- a/foundation/features/org.jboss.tools.foundation.license.feature/feature.xml
+++ b/foundation/features/org.jboss.tools.foundation.license.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.foundation.license.feature"
       label="JBoss Tools License feature"
-      version="1.6.1800.qualifier"
+      version="1.6.1900.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.jboss.org/tools">
diff --git a/foundation/features/org.jboss.tools.foundation.license.feature/pom.xml b/foundation/features/org.jboss.tools.foundation.license.feature/pom.xml
index 7531c5583..1f733fe93 100644
--- a/foundation/features/org.jboss.tools.foundation.license.feature/pom.xml
+++ b/foundation/features/org.jboss.tools.foundation.license.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>features</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.features</groupId>
 	<artifactId>org.jboss.tools.foundation.license.feature</artifactId> 
diff --git a/foundation/features/org.jboss.tools.foundation.security.linux.feature/feature.xml b/foundation/features/org.jboss.tools.foundation.security.linux.feature/feature.xml
index 49c59b25c..b0495c0dd 100644
--- a/foundation/features/org.jboss.tools.foundation.security.linux.feature/feature.xml
+++ b/foundation/features/org.jboss.tools.foundation.security.linux.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.foundation.security.linux.feature"
       label="%featureName"
-      version="1.6.1800.qualifier"
+      version="1.6.1900.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.foundation.security.linux"
       license-feature="org.jboss.tools.foundation.license.feature"
diff --git a/foundation/features/org.jboss.tools.foundation.security.linux.feature/pom.xml b/foundation/features/org.jboss.tools.foundation.security.linux.feature/pom.xml
index 23222d598..72c47b199 100644
--- a/foundation/features/org.jboss.tools.foundation.security.linux.feature/pom.xml
+++ b/foundation/features/org.jboss.tools.foundation.security.linux.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>features</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.features</groupId>
 	<artifactId>org.jboss.tools.foundation.security.linux.feature</artifactId> 
diff --git a/foundation/features/org.jboss.tools.foundation.test.feature/feature.xml b/foundation/features/org.jboss.tools.foundation.test.feature/feature.xml
index b7eec1efd..e18be2593 100644
--- a/foundation/features/org.jboss.tools.foundation.test.feature/feature.xml
+++ b/foundation/features/org.jboss.tools.foundation.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.foundation.test.feature"
       label="%featureName"
-      version="1.6.1800.qualifier"
+      version="1.6.1900.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">
diff --git a/foundation/features/org.jboss.tools.foundation.test.feature/pom.xml b/foundation/features/org.jboss.tools.foundation.test.feature/pom.xml
index 5dab48d7c..d551f8b94 100644
--- a/foundation/features/org.jboss.tools.foundation.test.feature/pom.xml
+++ b/foundation/features/org.jboss.tools.foundation.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>features</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.test.features</groupId>
 	<artifactId>org.jboss.tools.foundation.test.feature</artifactId> 
diff --git a/foundation/features/pom.xml b/foundation/features/pom.xml
index b51eaf1f5..27871fe61 100644
--- a/foundation/features/pom.xml
+++ b/foundation/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>foundation</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/foundation/plugins/org.jboss.tools.foundation.checkup/META-INF/MANIFEST.MF b/foundation/plugins/org.jboss.tools.foundation.checkup/META-INF/MANIFEST.MF
index 009e3cf6a..88b3ba384 100644
--- a/foundation/plugins/org.jboss.tools.foundation.checkup/META-INF/MANIFEST.MF
+++ b/foundation/plugins/org.jboss.tools.foundation.checkup/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui.workbench;bundle-version="3.107.0",
  org.eclipse.ui.views.log;bundle-version="1.0.600",
  org.eclipse.jface
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/foundation/plugins/org.jboss.tools.foundation.checkup/pom.xml b/foundation/plugins/org.jboss.tools.foundation.checkup/pom.xml
index 5c5b24b1c..6a0cd4e0c 100644
--- a/foundation/plugins/org.jboss.tools.foundation.checkup/pom.xml
+++ b/foundation/plugins/org.jboss.tools.foundation.checkup/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.plugins</groupId>
 	<artifactId>org.jboss.tools.foundation.checkup</artifactId> 
diff --git a/foundation/plugins/org.jboss.tools.foundation.core/.classpath b/foundation/plugins/org.jboss.tools.foundation.core/.classpath
index 1db08c6b4..7931ec26b 100644
--- a/foundation/plugins/org.jboss.tools.foundation.core/.classpath
+++ b/foundation/plugins/org.jboss.tools.foundation.core/.classpath
@@ -1,7 +1,21 @@
 <?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/foundation/plugins/org.jboss.tools.foundation.core/META-INF/MANIFEST.MF b/foundation/plugins/org.jboss.tools.foundation.core/META-INF/MANIFEST.MF
index 43a5e8851..bfb03f0a7 100644
--- a/foundation/plugins/org.jboss.tools.foundation.core/META-INF/MANIFEST.MF
+++ b/foundation/plugins/org.jboss.tools.foundation.core/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="2.2.0",
  org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.5.0",
  org.eclipse.e4.core.di;bundle-version="1.6.0"
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/foundation/plugins/org.jboss.tools.foundation.core/pom.xml b/foundation/plugins/org.jboss.tools.foundation.core/pom.xml
index 974ce6615..d0027b6ce 100644
--- a/foundation/plugins/org.jboss.tools.foundation.core/pom.xml
+++ b/foundation/plugins/org.jboss.tools.foundation.core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.plugins</groupId>
 	<artifactId>org.jboss.tools.foundation.core</artifactId>
diff --git a/foundation/plugins/org.jboss.tools.foundation.core/src/org/jboss/tools/foundation/core/properties/internal/currentversion.properties b/foundation/plugins/org.jboss.tools.foundation.core/src/org/jboss/tools/foundation/core/properties/internal/currentversion.properties
index d68f54983..51ce6ba14 100644
--- a/foundation/plugins/org.jboss.tools.foundation.core/src/org/jboss/tools/foundation/core/properties/internal/currentversion.properties
+++ b/foundation/plugins/org.jboss.tools.foundation.core/src/org/jboss/tools/foundation/core/properties/internal/currentversion.properties
@@ -9,5 +9,5 @@
 #     Red Hat, Inc. - initial API and implementation
 ##############################################################################
 # set default.version to the same x.y.z base as the parent pom, then .${BUILD_ALIAS} or .Final
-default.version=4.29.0.Final
+default.version=4.30.0.Final
 version=${jbosstools.version}
diff --git a/foundation/plugins/org.jboss.tools.foundation.help.ui/.classpath b/foundation/plugins/org.jboss.tools.foundation.help.ui/.classpath
index 0d7551747..8154eab6d 100644
--- a/foundation/plugins/org.jboss.tools.foundation.help.ui/.classpath
+++ b/foundation/plugins/org.jboss.tools.foundation.help.ui/.classpath
@@ -1,8 +1,22 @@
 <?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.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss-dmr-1.2.0.Final.jar"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/foundation/plugins/org.jboss.tools.foundation.help.ui/META-INF/MANIFEST.MF b/foundation/plugins/org.jboss.tools.foundation.help.ui/META-INF/MANIFEST.MF
index 41b56915b..98878ff12 100644
--- a/foundation/plugins/org.jboss.tools.foundation.help.ui/META-INF/MANIFEST.MF
+++ b/foundation/plugins/org.jboss.tools.foundation.help.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-SymbolicName: org.jboss.tools.foundation.help.ui;singleton:=true
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.jboss.tools.foundation.help.ui.internal.JBossHelpActivator
 Require-Bundle: org.eclipse.ui,
diff --git a/foundation/plugins/org.jboss.tools.foundation.help.ui/pom.xml b/foundation/plugins/org.jboss.tools.foundation.help.ui/pom.xml
index 968de4eac..54e6ebfec 100644
--- a/foundation/plugins/org.jboss.tools.foundation.help.ui/pom.xml
+++ b/foundation/plugins/org.jboss.tools.foundation.help.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.plugins</groupId>
 	<artifactId>org.jboss.tools.foundation.help.ui</artifactId>
diff --git a/foundation/plugins/org.jboss.tools.foundation.security.linux/META-INF/MANIFEST.MF b/foundation/plugins/org.jboss.tools.foundation.security.linux/META-INF/MANIFEST.MF
index fe92aedd0..48ec3fc6d 100644
--- a/foundation/plugins/org.jboss.tools.foundation.security.linux/META-INF/MANIFEST.MF
+++ b/foundation/plugins/org.jboss.tools.foundation.security.linux/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jboss.tools.foundation.security.linux;singleton:=true
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.equinox.security;bundle-version="1.1.100"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/foundation/plugins/org.jboss.tools.foundation.security.linux/pom.xml b/foundation/plugins/org.jboss.tools.foundation.security.linux/pom.xml
index 07148da28..c99a8f0c8 100644
--- a/foundation/plugins/org.jboss.tools.foundation.security.linux/pom.xml
+++ b/foundation/plugins/org.jboss.tools.foundation.security.linux/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.plugins</groupId>
 	<artifactId>org.jboss.tools.foundation.security.linux</artifactId> 
diff --git a/foundation/plugins/org.jboss.tools.foundation.ui/.classpath b/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
index b8c63f71f..bea76edce 100644
--- a/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
+++ b/foundation/plugins/org.jboss.tools.foundation.ui/.classpath
@@ -1,8 +1,22 @@
 <?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-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/magicfile4j-1.0.0-Beta1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/foundation/plugins/org.jboss.tools.foundation.ui/META-INF/MANIFEST.MF b/foundation/plugins/org.jboss.tools.foundation.ui/META-INF/MANIFEST.MF
index 4bd7f0b3e..bf0fc5b61 100644
--- a/foundation/plugins/org.jboss.tools.foundation.ui/META-INF/MANIFEST.MF
+++ b/foundation/plugins/org.jboss.tools.foundation.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.jface.databinding;bundle-version="1.14.100",
  org.eclipse.core.databinding.property;bundle-version="1.9.200",
  org.eclipse.jface.notifications;bundle-version="0.5.200"
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/foundation/plugins/org.jboss.tools.foundation.ui/pom.xml b/foundation/plugins/org.jboss.tools.foundation.ui/pom.xml
index 3d48307dd..2f1266708 100644
--- a/foundation/plugins/org.jboss.tools.foundation.ui/pom.xml
+++ b/foundation/plugins/org.jboss.tools.foundation.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>plugins</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.plugins</groupId>
 	<artifactId>org.jboss.tools.foundation.ui</artifactId> 
-	<version>1.6.1800-SNAPSHOT</version>
+	<version>1.6.1900-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>
diff --git a/foundation/plugins/pom.xml b/foundation/plugins/pom.xml
index 74a93f722..4865cafb5 100644
--- a/foundation/plugins/pom.xml
+++ b/foundation/plugins/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <parent>
     <groupId>org.jboss.tools</groupId>
     <artifactId>foundation</artifactId>
-    <version>1.6.1800-SNAPSHOT</version>
+    <version>1.6.1900-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modules>
diff --git a/foundation/pom.xml b/foundation/pom.xml
index c588925b8..f00d83a66 100644
--- a/foundation/pom.xml
+++ b/foundation/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>foundation</artifactId>
 	<name>foundation.all</name>
-	<version>1.6.1800-SNAPSHOT</version>
+	<version>1.6.1900-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>plugins</module>
diff --git a/foundation/tests/org.jboss.tools.foundation.checkup.test/META-INF/MANIFEST.MF b/foundation/tests/org.jboss.tools.foundation.checkup.test/META-INF/MANIFEST.MF
index e40ffc0ef..8ac4b0058 100644
--- a/foundation/tests/org.jboss.tools.foundation.checkup.test/META-INF/MANIFEST.MF
+++ b/foundation/tests/org.jboss.tools.foundation.checkup.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Foundation Checkup Test
 Bundle-SymbolicName: org.jboss.tools.foundation.checkup.test
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Export-Package: org.jboss.tools.foundation.checkup.test
 Require-Bundle: org.junit,
  org.jboss.tools.foundation.checkup;bundle-version="1.2.0",
diff --git a/foundation/tests/org.jboss.tools.foundation.checkup.test/pom.xml b/foundation/tests/org.jboss.tools.foundation.checkup.test/pom.xml
index 5c05fbcb2..fa01f187d 100644
--- a/foundation/tests/org.jboss.tools.foundation.checkup.test/pom.xml
+++ b/foundation/tests/org.jboss.tools.foundation.checkup.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.tests</groupId>
 	<artifactId>org.jboss.tools.foundation.checkup.test</artifactId>
diff --git a/foundation/tests/org.jboss.tools.foundation.core.test/META-INF/MANIFEST.MF b/foundation/tests/org.jboss.tools.foundation.core.test/META-INF/MANIFEST.MF
index 588a05a1b..cdf17bb5b 100644
--- a/foundation/tests/org.jboss.tools.foundation.core.test/META-INF/MANIFEST.MF
+++ b/foundation/tests/org.jboss.tools.foundation.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-SymbolicName: org.jboss.tools.foundation.core.test;singleton:=true
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
  org.eclipse.equinox.http.jetty;bundle-version="3.0.100",
diff --git a/foundation/tests/org.jboss.tools.foundation.core.test/pom.xml b/foundation/tests/org.jboss.tools.foundation.core.test/pom.xml
index 587328478..a80c7cf15 100644
--- a/foundation/tests/org.jboss.tools.foundation.core.test/pom.xml
+++ b/foundation/tests/org.jboss.tools.foundation.core.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.tests</groupId>
 	<artifactId>org.jboss.tools.foundation.core.test</artifactId>
diff --git a/foundation/tests/org.jboss.tools.foundation.core.test/src/org/jboss/tools/foundation/core/test/ecf/URLTransportUtilTest.java b/foundation/tests/org.jboss.tools.foundation.core.test/src/org/jboss/tools/foundation/core/test/ecf/URLTransportUtilTest.java
index d9663fe38..261f29bd3 100644
--- a/foundation/tests/org.jboss.tools.foundation.core.test/src/org/jboss/tools/foundation/core/test/ecf/URLTransportUtilTest.java
+++ b/foundation/tests/org.jboss.tools.foundation.core.test/src/org/jboss/tools/foundation/core/test/ecf/URLTransportUtilTest.java
@@ -158,7 +158,7 @@ public void testTimeoutWithoutCancel() throws Exception {
 			URLTransportUtility util = new URLTransportUtility();
 			ByteArrayOutputStream os = new ByteArrayOutputStream();
 			long t1 = System.currentTimeMillis();
-			IStatus s = util.download("displayString", url, os, 500, monitor);
+			IStatus s = util.download("displayString", url, os, 600, monitor);
 			long t2 = System.currentTimeMillis();
 			assertTrue(s.getSeverity() == IStatus.ERROR);
 			assertTrue(t2 - t1 < 3000);
@@ -191,7 +191,7 @@ public void run() {
 				ByteArrayOutputStream os = new ByteArrayOutputStream();
 				IStatus s = util.download("displayString", url.toExternalForm(), os, monitor);
 				synchronized (times) {
-					times[1] = System.currentTimeMillis();				
+					times[1] = System.currentTimeMillis();
 				}
 				assertTrue(s.getSeverity() == IStatus.CANCEL || s.getSeverity() == IStatus.ERROR);
 				// MUST cancel within 500 ms
diff --git a/foundation/tests/org.jboss.tools.foundation.help.test/META-INF/MANIFEST.MF b/foundation/tests/org.jboss.tools.foundation.help.test/META-INF/MANIFEST.MF
index b7dbf3a5c..d0728f881 100644
--- a/foundation/tests/org.jboss.tools.foundation.help.test/META-INF/MANIFEST.MF
+++ b/foundation/tests/org.jboss.tools.foundation.help.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JBoss Tools Help Plugin - Tests
 Bundle-SymbolicName: org.jboss.tools.foundation.help.test
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Fragment-Host: org.jboss.tools.foundation.help.ui;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.11.0"
diff --git a/foundation/tests/org.jboss.tools.foundation.help.test/pom.xml b/foundation/tests/org.jboss.tools.foundation.help.test/pom.xml
index 0096f7c50..7a56a72b7 100644
--- a/foundation/tests/org.jboss.tools.foundation.help.test/pom.xml
+++ b/foundation/tests/org.jboss.tools.foundation.help.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.tests</groupId>
 	<artifactId>org.jboss.tools.foundation.help.test</artifactId>
diff --git a/foundation/tests/org.jboss.tools.foundation.ui.test/META-INF/MANIFEST.MF b/foundation/tests/org.jboss.tools.foundation.ui.test/META-INF/MANIFEST.MF
index e891a8c73..2ca83f739 100644
--- a/foundation/tests/org.jboss.tools.foundation.ui.test/META-INF/MANIFEST.MF
+++ b/foundation/tests/org.jboss.tools.foundation.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Foundation UI Test
 Bundle-SymbolicName: org.jboss.tools.foundation.ui.test;singleton:=true
-Bundle-Version: 1.6.1800.qualifier
+Bundle-Version: 1.6.1900.qualifier
 Bundle-ClassPath: .
 Export-Package: org.jboss.tools.foundation.ui.test
 Require-Bundle: org.junit,
diff --git a/foundation/tests/org.jboss.tools.foundation.ui.test/pom.xml b/foundation/tests/org.jboss.tools.foundation.ui.test/pom.xml
index f7c86c5f7..4dd6fb2df 100644
--- a/foundation/tests/org.jboss.tools.foundation.ui.test/pom.xml
+++ b/foundation/tests/org.jboss.tools.foundation.ui.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.foundation</groupId>
 		<artifactId>tests</artifactId>
-		<version>1.6.1800-SNAPSHOT</version>
+		<version>1.6.1900-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.foundation.tests</groupId>
 	<artifactId>org.jboss.tools.foundation.ui.test</artifactId>
diff --git a/foundation/tests/pom.xml b/foundation/tests/pom.xml
index 2d161cb33..3a03d2e20 100644
--- a/foundation/tests/pom.xml
+++ b/foundation/tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.tools</groupId>
     <artifactId>foundation</artifactId>
-    <version>1.6.1800-SNAPSHOT</version>
+    <version>1.6.1900-SNAPSHOT</version>
   </parent>
   <groupId>org.jboss.tools.foundation</groupId>
   <artifactId>tests</artifactId>
diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml
index 15e632862..1ef8c54d7 100644
--- a/jacoco-report/pom.xml
+++ b/jacoco-report/pom.xml
@@ -16,7 +16,7 @@
 		<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 		<enforceExcludePatternExtras>|plugins.version.*</enforceExcludePatternExtras>
 		<plugins.version.common>3.18.0-SNAPSHOT</plugins.version.common>
-		<plugins.version.foundation>1.6.1800-SNAPSHOT</plugins.version.foundation>
+		<plugins.version.foundation>1.6.1900-SNAPSHOT</plugins.version.foundation>
 		<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>