diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json
index 026c5b450..30ac2fdf2 100644
--- a/atom-extensions/atom-bosh/package.json
+++ b/atom-extensions/atom-bosh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bosh-yaml",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Provides validation and content assist for various Bosh configuration files",
   "repository": "https://github.com/spring-projects/atom-bosh",
   "icon": "icon.png",
diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json
index 07711f0fe..d71df9ed9 100644
--- a/atom-extensions/atom-cf-manifest-yaml/package.json
+++ b/atom-extensions/atom-cf-manifest-yaml/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cf-manifest-yaml",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Cloud Foundry Deployment Manifest YAML support for Atom",
   "repository": "https://github.com/spring-projects/atom-cf-manifest-yaml",
   "icon": "icon.png",
diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json
index afd4dcc61..2ce978629 100644
--- a/atom-extensions/atom-concourse/package.json
+++ b/atom-extensions/atom-concourse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "concourse-pipeline-yaml",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files",
   "repository": "https://github.com/spring-projects/atom-concourse",
   "icon": "icon.png",
diff --git a/atom-extensions/atom-spring-boot/package.json b/atom-extensions/atom-spring-boot/package.json
index f9b6e8afd..9139120b5 100644
--- a/atom-extensions/atom-spring-boot/package.json
+++ b/atom-extensions/atom-spring-boot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spring-boot",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Spring Boot support for Atom",
   "repository": "https://github.com/spring-projects/atom-spring-boot",
   "icon": "icon.png",
diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index 3855e7c18..601e73566 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,6 +23,7 @@
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
+			<li>for Eclipse 2018-12 (4.10): <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.10">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.10</a></li>
 			<li>for Eclipse 2018-09 (4.9): <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.9">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.9</a></li>
 			<li>for Eclipse Photon (4.8) - no longer updated: <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8</a></li>
 			<li>for Eclipse Neon (4.7) - no longer updated: <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.7">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.7</a></li>
@@ -49,7 +50,13 @@
 				
 	<h2>Eclipse-based Distribution Builds</h2>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2018-09 Milestone Builds (4.9.0) - and beyond</h3>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2018-12 Milestone Builds (4.10.0)</h3>
+	<div id="e410"></div>
+	<script type="text/javascript">
+	$('#e410').load('sts4-nightly-e4.10.html');
+	</script>
+	
+	<h3>Spring Tool Suite 4 - based on Eclipse 2018-09 Release (4.9.0)</h3>
 	<div id="e49"></div>
 	<script type="text/javascript">
 	$('#e49').load('sts4-nightly-e4.9.html');
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
index 08446b71d..dd689206d 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.boot.ide.branding.feature"
 	label="Spring Tool Suite 4 Branding Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
 	<plugin
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
index c2a5ca497..e169720ac 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
index bec1f63b2..eedb0870b 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.springframework.boot.ide.branding;singleton:=true
-Bundle-Version: 4.0.1.qualifier
+Bundle-Version: 4.0.2.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.ui,
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
index f4ccd52eb..3cad0bcc0 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
similarity index 96%
rename from eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
index d3fe3947e..a0752deb8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
@@ -67,6 +67,10 @@ openFile</programArgs>
       <feature id="org.eclipse.wst.json_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.jsdt.feature" installMode="root"/>
       <feature id="org.eclipse.wst.jsdt.chromium.debug.feature" installMode="root"/>
+
+      <feature id="org.eclipse.jst.server_adapters.ext.feature" installMode="root"/>
+      <feature id="org.eclipse.jst.server_adapters.feature" installMode="root"/>
+
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e410/p2.inf
similarity index 82%
rename from eclipse-distribution/org.springframework.boot.ide.product.e48/p2.inf
rename to eclipse-distribution/org.springframework.boot.ide.product.e410/p2.inf
index e962eb62e..0faf01b98 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e48/p2.inf
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/p2.inf
@@ -1,16 +1,16 @@
 instructions.configure=\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/photon,name:Photon);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/photon,name:Photon);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.8,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.8,name:Spring Tool Suite 4);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
  org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);
 
 instructions.unconfigure=\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/photon);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/photon);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.8);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.8);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.product.e48/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml
index d1effaa8e..d916cdaac 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e48/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json b/eclipse-distribution/org.springframework.boot.ide.product.e410/spring-tool-suite-4-dmg-config-e4.10.json
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json
rename to eclipse-distribution/org.springframework.boot.ide.product.e410/spring-tool-suite-4-dmg-config-e4.10.json
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/.project b/eclipse-distribution/org.springframework.boot.ide.product.e47/.project
deleted file mode 100644
index 3ec4c6a50..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.springframework.boot.ide.product</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
deleted file mode 100644
index e2ebd0cde..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-product org.springframework.boot.ide.branding.sts4
---launcher.defaultAction
-openFile</programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.8
---add-modules=ALL-SYSTEM
--Xms40m</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
-         <argsX86_64>-Xmx1200m</argsX86_64>
-      </vmArgsMac>
-      <vmArgsWin>
-         <argsX86_64>-Xmx1200m</argsX86_64>
-      </vmArgsWin>
-      <vmArgsLin>
-         <argsX86_64>-Xmx1200m</argsX86_64>
-      </vmArgsLin>
-   </launcherArgs>
-
-   <windowImages i16="/org.springframework.boot.ide.branding/sts4-16.png" i32="/org.springframework.boot.ide.branding/sts4-32.png" i48="/orgorg.springframework.boot.ide.branding/sts4-48.png" i64="/org.springframework.boot.ide.branding/sts4-64.png" i128="/org.springframework.boot.ide.branding/sts4-128.png"/>
-
-   <splash
-      startupProgressRect="0,225,455,15"
-      startupMessageRect="7,220,441,20"
-      startupForegroundColor="c1d72e" />
-
-   <launcher name="SpringToolSuite4">
-      <macosx icon="../org.springframework.boot.ide.branding/sts4.icns"/>
-      <solaris/>
-      <win useIco="true">
-         <ico path="../org.springframework.boot.ide.branding/sts4.ico"/>
-         <bmp/>
-      </win>
-      <linux icon="../org.springframework.boot.ide.branding/sts4.xpm"/>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <features>
-      <feature id="org.eclipse.platform" installMode="root"/>
-      <feature id="org.eclipse.pde" installMode="root"/>
-
-      <feature id="org.eclipse.buildship" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
-
-      <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
-      <feature id="org.eclipse.help" installMode="root"/>
-
-      <feature id="org.eclipse.jdt" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-      <feature id="org.eclipse.m2e.feature" installMode="root"/>
-      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
-      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/>
-
-      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
-      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
-      <feature id="org.eclipse.wst.json_ui.feature" installMode="root"/>
-      <feature id="org.eclipse.wst.jsdt.feature" installMode="root"/>
-      <feature id="org.eclipse.wst.jsdt.chromium.debug.feature" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.rse" installMode="root"/>
-      <feature id="org.eclipse.epp.mpc" installMode="root"/>
-
-      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
-      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
-      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/>
-      <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
-      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
-
-      <feature id="net.mihai-nita.ansicon" installMode="root"/>
-
-
-      <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
-      <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
-
-      <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
-      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
-      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
-
-   </features>
-
-   <configurations>
-   	  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}"/>
-   	  <property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
-   	  <property name="osgi.splashPath" value="platform:/base/plugins/org.springframework.boot.ide.branding"/>
-   	  
-   	  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-   	  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-   	  <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-   	  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-   	  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-   	  <plugin id="org.eclipse.update.configurator" autoStart="false" startLevel="4" />
-   </configurations>
-
-</product>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/p2.inf b/eclipse-distribution/org.springframework.boot.ide.product.e47/p2.inf
deleted file mode 100644
index a060eefdf..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/p2.inf
+++ /dev/null
@@ -1,15 +0,0 @@
-instructions.configure=\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.7,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.7,name:Spring Tool Suite 4);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);
-
-instructions.unconfigure=\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.7);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/e4.7);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
- org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
deleted file mode 100644
index 05241cd15..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.springframework.boot.ide</groupId>
-		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>org.springframework.boot.ide.product</artifactId>
-
-	<packaging>eclipse-repository</packaging>
-
-	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
-	</properties>
-
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-install</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<includeAllDependencies>false</includeAllDependencies>
-				</configuration>
-			</plugin>
-			  
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-publisher-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<publishArtifacts>true</publishArtifacts>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-director-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>materialize-products</id>
-						<goals>
-							<goal>materialize-products</goal>
-						</goals>
-						<phase>package</phase>
-					</execution>
-					<execution>
-						<id>archive-products</id>
-						<goals>
-							<goal>archive-products</goal>
-						</goals>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<products>
-						<product>
-							<id>org.springframework.boot.ide.branding.sts4</id>
-							<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
-							<rootFolders>
-								<macosx>SpringToolSuite4.app</macosx>
-							</rootFolders>
-							<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
-						</product>
-					</products>
-					<formats>
-						<linux>tar.gz</linux>
-						<macosx>tar.gz</macosx>
-					</formats>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-
-					<execution>
-						<id>osx-app-signing</id>
-						<phase>package</phase>
-						<configuration>
-							<skip>${skip.osx.signing}</skip>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
-								<exec executable="codesign" failonerror="true">
-									<arg value="--verbose"/>
-								    <arg value="--keychain"/>
-								    <arg value="${env.KEYCHAIN}"/>
-								    <arg value="-s"/>
-								    <arg value="Developer ID Application: Trevor Marshall"/>
-								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
-								</exec>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>osx-dmg-creation</id>
-						<phase>verify</phase>
-						<configuration>
-							<target>
-
-								<exec executable="/usr/local/bin/appdmg" failonerror="true">
-									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
-									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
-								</exec>
-
-								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
-								
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>osx-dmg-signing</id>
-						<phase>verify</phase>
-						<configuration>
-							<skip>${skip.osx.signing}</skip>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
-								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
-
-								<exec executable="codesign" failonerror="true">
-									<arg value="--verbose"/>
-								    <arg value="--keychain"/>
-								    <arg value="${env.KEYCHAIN}"/>
-								    <arg value="-s"/>
-								    <arg value="Developer ID Application: Trevor Marshall"/>
-								    <arg value="${dmgName}"/>
-								</exec>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>upload-product-bundles</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path.product}">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
-											<include name="spring-tool-suite-4*.tar.gz" />
-											<include name="spring-tool-suite-4*.tar.gz.md5" />
-											<include name="spring-tool-suite-4*.tar.gz.sha1" />
-											<include name="spring-tool-suite-4*.dmg" />
-											<include name="spring-tool-suite-4*.dmg.md5" />
-											<include name="spring-tool-suite-4*.dmg.sha1" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
-										publicRead="true">
-										<fileset dir="${project.build.directory}/products">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
-											<include name="spring-tool-suite-4*.tar.gz" />
-											<include name="spring-tool-suite-4*.tar.gz.md5" />
-											<include name="spring-tool-suite-4*.tar.gz.sha1" />
-											<include name="spring-tool-suite-4*.dmg" />
-											<include name="spring-tool-suite-4*.dmg.md5" />
-											<include name="spring-tool-suite-4*.dmg.sha1" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>update-nightly-downloads</id>
-						<phase>deploy</phase>
-						<configuration>
-							<skip>${skip.update-nightly-download-page}</skip>
-							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"/>
-		
-								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
-								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
-								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
-										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-									</upload>
-								</s3>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.1.0.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.8.1</version>
-					</dependency>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>20020829</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-		</plugins>
-
-	</build>
-</project>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/spring-tool-suite-4-dmg-config-e4.8.json b/eclipse-distribution/org.springframework.boot.ide.product.e48/spring-tool-suite-4-dmg-config-e4.8.json
deleted file mode 100644
index c86b0023f..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.product.e48/spring-tool-suite-4-dmg-config-e4.8.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Spring Tool Suite 4",
-  "icon": "../org.springframework.boot.ide.branding/sts4.icns",
-  "contents": [
-    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" },
-    { "x": 448, "y": 100, "type": "link", "path": "/Applications" },
-    { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts4.icns", "name": ".VolumeIcon.icns" }
-  ],
-  "format": "UDZO"
-}
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
index 6de760884..d916cdaac 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e410/category.xml
similarity index 92%
rename from eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.repository.e410/category.xml
index b145883a2..f97e38841 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e410/category.xml
@@ -35,26 +35,11 @@
 	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
 	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
 
-<!--	<feature
-		id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
-	</feature> -->
-
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
-<!--	<feature
-		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
-		<category name="Resources / Spring IDE" />
-	</feature> -->
-
-<!--	<feature
-		id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
-		<category name="Resources / Spring IDE" />
-	</feature> -->
-
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
@@ -132,6 +117,24 @@
 		<category name="Uncategorized"/>
 	</bundle>
 -->
+	<bundle id="javax.activation" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+	<bundle id="javax.activation.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="javax.xml.bind" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+	<bundle id="javax.xml.bind.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="javax.xml.stream" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
 	<bundle id="org.dadacoalition.yedit">
 		<category name="Uncategorized"/>
 	</bundle>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e48/pom.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e410/pom.xml
similarity index 99%
rename from eclipse-distribution/org.springframework.boot.ide.repository.e48/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.repository.e410/pom.xml
index 5bf988898..9680c9a33 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e48/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e410/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/.project b/eclipse-distribution/org.springframework.boot.ide.repository.e47/.project
deleted file mode 100644
index c637ba2c5..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.springframework.boot.ide.repository</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
deleted file mode 100644
index 6cc4f5f16..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site pack200="true">
-	<description url="http://spring.io/tools">
-		Spring Tool Suite 4
-	</description>
-
-	<!-- Eclipse Integration Commons -->
-	<category-def name="Uncategorized" label="Uncategorized"/>
-	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
-	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
-
-	<feature
-		id="org.springsource.ide.eclipse.commons.quicksearch.feature"
-		version="0.0.0">
-		<category name="Core / Eclipse Integration Commons" />
-	</feature>
-	
-	<!-- STS4 branding and custom features -->
-	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
-
-	<feature
-		id="org.springframework.boot.ide.main.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
-	</feature>
-
-	<feature
-		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
-	</feature>
-
-	<!-- Spring IDE -->
-	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
-	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
-	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
-	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
-	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
-
-<!--	<feature
-		id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
-	</feature> -->
-
-	<feature
-		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
-	</feature>
-
-<!--	<feature
-		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
-		<category name="Resources / Spring IDE" />
-	</feature> -->
-
-<!--	<feature
-		id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
-		<category name="Resources / Spring IDE" />
-	</feature> -->
-
-	<feature
-		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
-		<category name="Resources / Spring IDE" />
-	</feature>
-
-	<!-- Language Server -->
-	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
-
-	<feature
-		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
-	<feature
-		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
-	<feature
-		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
-	<feature
-		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
-	<feature
-		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
-	<bundle id="org.springframework.tooling.ls.eclipse.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
-	</bundle>
-
-	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.core">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.ui">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.completions">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-
-	<bundle id="org.springsource.ide.eclipse.commons.livexp">
-		<category name="Core / Eclipse Integration Commons"/>
-	</bundle>
-<!--
-	<bundle id="io.projectreactor.reactor-core">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.reactivestreams.reactive-streams">
-		<category name="Uncategorized"/>
-	</bundle>
--->
-	<bundle id="org.dadacoalition.yedit">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.yaml.snakeyaml">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<feature id="tm-feature">
-		<category name="Uncategorized"/>
-	</feature>
-
-	<bundle id="org.eclipse.lsp4e">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.eclipse.lsp4j">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.eclipse.lsp4j.jsonrpc">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.eclipse.xtext.xbase.lib">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="com.google.gson">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.jcodings">
-		<category name="Uncategorized"/>
-	</bundle>
-
-	<bundle id="org.joni">
-		<category name="Uncategorized"/>
-	</bundle>
-
-</site>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/pom.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/pom.xml
deleted file mode 100644
index 5bf988898..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.springframework.boot.ide</groupId>
-		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>org.springframework.boot.ide.repository</artifactId>
-
-	<packaging>eclipse-repository</packaging>
-
-	<properties>
-		<dist.accessKey>${accessKey}</dist.accessKey>
-		<dist.secretKey>${secretKey}</dist.secretKey>
-	</properties>
-
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-install</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-install</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-			
-			
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-
-					<execution>
-						<id>zip-sts-repository</id>
-						<phase>install</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
-								<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
-
-								<zip zipfile="${project.build.directory}/repository/${dist.file.name}" filesonly="true">
-									<zipfileset
-										dir="${project.build.directory}/repository">
-										<exclude name="*.zip" />
-										<exclude name="**/*.gz" />
-									</zipfileset>
-								</zip>
-
-								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
-								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>upload-sts-repository</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path.repo}">
-											<include name="p2.index" />
-											<include name="site.xml" />
-											<include name="content.jar" />
-											<include name="artifacts.xml.xz" />
-											<include name="content.jar" />
-											<include name="content.xml.xz" />
-											<include name="plugins/**" />
-											<include name="features/**" />
-											<include name="binary/**" />
-											<include name="*.zip" />
-											<include name="*.sha1" />
-											<include name="*.md5" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
-										<fileset
-											dir="${project.build.directory}/repository">
-											<include name="**/*" />
-											<include name="**" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.1.0.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.8.1</version>
-					</dependency>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>20020829</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-		</plugins>
-
-	</build>
-</project>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml
index 163840b12..9680c9a33 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index ab99f35fb..01f25b0bf 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.boot.ide</groupId>
 	<artifactId>org.springframework.boot.ide</artifactId>
-	<version>4.0.1-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -61,7 +61,7 @@
 		<springide-p2-repo>http://dist.springframework.org/release/IDE/3.9.6.RELEASE</springide-p2-repo> -->
 		<sts4-language-servers-p2-repo>http://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 
-		<tycho-version>0.26.0</tycho-version>
+		<tycho-version>1.1.0</tycho-version>
 		<encoding>UTF-8</encoding>
 	</properties>
 
@@ -103,199 +103,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e47</id>
-			<properties>
-				<dist.target>e4.7.3</dist.target>
-				<dist.target.major>e4.7</dist.target.major>
-				<dist.platform.name>Oxygen</dist.platform.name>
-				<dist.platform.name.long>Oxygen.3 (4.7.3)</dist.platform.name.long>
-				<dist.platform.id>oxygen</dist.platform.id>
-				<dist.platform.version>4.7</dist.platform.version>
-				<package.qualifierPrefix>e47</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>oxygen</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/oxygen/</url>
-				</repository>
-<!--				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/oxygen/</url>
-				</repository> -->
-<!--				<repository>
-					<id>platform-m-build</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/eclipse/updates/4.7-M-builds</url>
-				</repository> -->
-				<repository>
-					<id>latest-m2e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/technology/m2e/releases</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-milestones</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/technology/m2e/milestones/1.8/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</url>
-				</repository>
-				<repository>
-					<id>latest-buildship-release</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/buildship/updates/e47/releases/2.x</url>
-				</repository>
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>http://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.14.0/N/0.14.0.201504071521/</url>
-				</repository>
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>http://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
-				</repository>
-				<repository>
-					<id>maven-devtools</id>
-					<layout>p2</layout>
-					<url>http://dist.springsource.com/release/TOOLS/mavendevtools/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>http://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-				<repository>
-					<id>ansi-console</id>
-					<layout>p2</layout>
-					<url>http://www.mihai-nita.net/eclipse</url>
-				</repository>
-				<repository>
-					<id>xtext-base</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
-				</repository>
-				<repository>
-					<id>lsp4e-050-stream</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/lsp4e/0.5.x-snapshots/</url>
-				</repository>
-			</repositories>
-			<modules>
-				<module>org.springframework.boot.ide.product.e47</module>
-				<module>org.springframework.boot.ide.repository.e47</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>e48</id>
-			<properties>
-				<dist.target>e4.8.0</dist.target>
-				<dist.target.major>e4.8</dist.target.major>
-				<dist.platform.name>Photon</dist.platform.name>
-				<dist.platform.name.long>Photon (4.8.0)</dist.platform.name.long>
-				<dist.platform.id>photon</dist.platform.id>
-				<dist.platform.version>4.8</dist.platform.version>
-				<package.qualifierPrefix>e48</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>photon</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/photon/</url>
-				</repository>
-				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/photon/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</url>
-				</repository>
-<!--				<repository>
-					<id>orbit-i-builds</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</url>
-				</repository> -->
-				<repository>
-					<id>latest-m2e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/technology/m2e/releases/1.8</url>
-				</repository>
-<!--				<repository>
-					<id>latest-m2e-milestones</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/technology/m2e/milestones/1.8/</url>
-				</repository> -->
-<!--				<repository>
-					<id>latest-buildship-release</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/buildship/updates/e47/releases/2.x</url>
-				</repository> -->
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>http://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
-				</repository>
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>http://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
-				</repository>
-				<repository>
-					<id>maven-devtools</id>
-					<layout>p2</layout>
-					<url>http://dist.springsource.com/release/TOOLS/mavendevtools/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>http://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-				<repository>
-					<id>ansi-console</id>
-					<layout>p2</layout>
-					<url>http://www.mihai-nita.net/eclipse</url>
-				</repository>
-				<repository>
-					<id>xtext-base</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-<!--				<repository>
-					<id>lsp4j</id>
-					<layout>p2</layout>
-					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastSuccessfulBuild/artifact/build/p2-repository/</url>
-				</repository> -->
-			</repositories>
-			<modules>
-				<module>org.springframework.boot.ide.product.e48</module>
-				<module>org.springframework.boot.ide.repository.e48</module>
-			</modules>
-		</profile>
-
 		<profile>
 			<id>e49</id>
 			<properties>
@@ -380,6 +187,90 @@
 			</modules>
 		</profile>
 
+		<profile>
+			<id>e410</id>
+			<properties>
+				<dist.target>e4.10.0</dist.target>
+				<dist.target.major>e4.10</dist.target.major>
+				<dist.platform.name>2018-12</dist.platform.name>
+				<dist.platform.name.long>2018-12 (4.10.0)</dist.platform.name.long>
+				<dist.platform.id>2018-12</dist.platform.id>
+				<dist.platform.version>4.10</dist.platform.version>
+				<package.qualifierPrefix>e410</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>photon</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/releases/2018-12/</url>
+				</repository>
+				<repository>
+					<id>staging</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/staging/2018-12/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20181031145145/repository</url>
+				</repository>
+				<repository>
+					<id>latest-m2e</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/m2e/releases/1.8</url>
+				</repository>
+				<repository>
+					<id>maven-extras-mirror</id>
+					<layout>p2</layout>
+					<url>http://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
+				</repository>
+				<repository>
+					<id>maven-egit</id>
+					<layout>p2</layout>
+					<url>http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
+				</repository>
+				<repository>
+					<id>maven-wro4j</id>
+					<layout>p2</layout>
+					<url>http://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
+				</repository>
+				<repository>
+					<id>maven-devtools</id>
+					<layout>p2</layout>
+					<url>http://dist.springsource.com/release/TOOLS/mavendevtools/</url>
+				</repository>
+				<repository>
+					<id>maven-dependency-support</id>
+					<layout>p2</layout>
+					<url>http://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
+				</repository>
+				<repository>
+					<id>ansi-console</id>
+					<layout>p2</layout>
+					<url>http://www.mihai-nita.net/eclipse</url>
+				</repository>
+				<repository>
+					<id>xtext-base</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
+				</repository>
+				<repository>
+					<id>lsp4e</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
+				</repository>
+<!--				<repository>
+					<id>lsp4j</id>
+					<layout>p2</layout>
+					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastSuccessfulBuild/artifact/build/p2-repository/</url>
+				</repository> -->
+			</repositories>
+			<modules>
+				<module>org.springframework.boot.ide.product.e410</module>
+				<module>org.springframework.boot.ide.repository.e410</module>
+			</modules>
+		</profile>
+
 		<profile>
 			<id>build.springsource.com</id>
 			<activation>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
index f6f712d16..1ef0f7acc 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.boot.ide.main.feature"
 	label="Spring Tool Suite 4 Main Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
     <description>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
index db97b3934..85585fab6 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../../eclipse-distribution/pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
index 1a0261a70..8abce9747 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.tooling.boot.ls.feature"
 	label="Spring Boot Language Server Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
     <description>
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml
index bff21dfde..79181357d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index 1977676c7..85663f113 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Spring Boot Language Server
 Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.boot.ls;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
index 418b72af4..4e687546d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
@@ -7,19 +7,19 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>org.springframework.tooling.boot.ls</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
 			<artifactId>spring-boot-language-server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java
index 259a47d23..62444352a 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java
@@ -16,7 +16,7 @@ package org.springframework.tooling.boot.ls;
 public class Constants {
 	
 	public static final String PLUGIN_ID = "org.springframework.tooling.boot.ls";
-	public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT.jar";
+	public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT.jar";
 	
 	public static final String PREF_BOOT_HINTS = "boot-java.boot-hints.on";
 	public static final String PREF_CHANGE_DETECTION = "boot-java.change-detection.on";
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
index 2a6d88eaf..f5b8dfa17 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.tooling.bosh.ls.feature"
 	label="BOSH Language Server Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
     <description>
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml
index c20080467..f1c50fedd 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
index 20ebef568..8818de318 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: BOSH Manifest Language Server
 Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.bosh.ls;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
index 8174c62be..742f43127 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
@@ -7,19 +7,19 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>org.springframework.tooling.bosh.ls</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
 			<artifactId>bosh-language-server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		    <exclusions>
 		        <exclusion>
 		            <groupId>org.springframework.ide.eclipse</groupId>
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/Constants.java
index 581d93db5..f3e4f7899 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/Constants.java
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/Constants.java
@@ -16,6 +16,6 @@ package org.springframework.tooling.bosh.ls;
 public class Constants {
 	
 	public static final String PLUGIN_ID = "org.springframework.tooling.bosh.ls";
-	public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT";
+	public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT";
 
 }
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
index c8d35c5af..19cd0f539 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
       label="%featureName"
-      version="4.0.1.qualifier"
+      version="4.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml
index f824ea92f..d653350d0 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
index 853482710..858a1d2c2 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature"
 	label="Cloud Foundry Manifest Language Server Generic Editor Integration Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
     <description>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml
index 73fde7de7..1b62e985b 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
index 3f494ef26..570bf8061 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Foundry Manifest Language Server Generic Editor Integration
 Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls.integration;singleton:=true
-Bundle-Version: 4.0.1.qualifier
+Bundle-Version: 4.0.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml
index 71f86d5fe..578bf3fe8 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
index 575a519b2..e07775783 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Foundry Manifest Language Server
 Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
index 5d67d4835..320ed4fdf 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
@@ -7,19 +7,19 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>org.springframework.tooling.cloudfoundry.manifest.ls</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
 			<artifactId>manifest-yaml-language-server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
index c9ab7cf71..176cd2161 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
@@ -16,6 +16,6 @@ package org.springframework.tooling.cloudfoundry.manifest.ls;
 public class Constants {
 
 	public static final String PLUGIN_ID = "org.springframework.tooling.cloudfoundry.manifest.ls";
-	public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT.jar";
+	public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT.jar";
 
 }
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
index 5edd29d6e..739f5222a 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
 	id="org.springframework.tooling.concourse.ls.feature"
 	label="Concourse Pipeline Language Server Feature"
-	version="4.0.1.qualifier"
+	version="4.0.2.qualifier"
 	provider-name="Pivotal, Inc.">
 
     <description>
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml
index a21d9e0ad..dbc8cd6e5 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
index e6c57594f..fe2b3e314 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Concourse Pipeline Language Server
 Bundle-Vendor: Pivotal, Inc.
 Bundle-SymbolicName: org.springframework.tooling.concourse.ls;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
index d9a2871cd..e69ce94fd 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
@@ -7,19 +7,19 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>org.springframework.tooling.concourse.ls</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
 			<artifactId>concourse-language-server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		    <exclusions>
 		        <exclusion>
 		            <groupId>org.springframework.ide.eclipse</groupId>
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/Constants.java
index c91e64e7b..da3a52688 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/Constants.java
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/Constants.java
@@ -16,6 +16,6 @@ package org.springframework.tooling.concourse.ls;
 public class Constants {
 	
 	public static final String PLUGIN_ID = "org.springframework.tooling.concourse.ls";
-	public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT";
+	public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT";
 
 }
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml
index df1919ffa..e4f6b9f2f 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
index e3ee73e36..8bf33fab1 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Language Server Commons
 Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true
-Bundle-Version: 4.0.1.qualifier
+Bundle-Version: 4.0.2.qualifier
 Bundle-Vendor: Pivotal, Inc.
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.ui,
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml
index 05153112c..37c5963b2 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
index 11a726914..cef332a88 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Goto Symbol Popup
 Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.gotosymbol;singleton:=true
-Bundle-Version: 4.0.1.qualifier
+Bundle-Version: 4.0.2.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.lsp4e;bundle-version="0.5.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
index 6d980c69f..2b975ddb0 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
index 25b8d2889..76bde39af 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
index 6348a95a6..bc02e8a79 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
 		<artifactId>org.springframework.boot.ide.servers</artifactId>
-		<version>4.0.1-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 1410c014b..87ae5c90e 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.boot.ide</groupId>
 	<artifactId>org.springframework.boot.ide.servers</artifactId>
-	<version>4.0.1-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -102,116 +102,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e47</id>
-			<properties>
-				<dist.target>e4.7.3</dist.target>
-				<dist.target.major>e4.7</dist.target.major>
-				<dist.platform.name>Oxygen</dist.platform.name>
-				<dist.platform.name.long>Oxygen.3 (4.7.3)</dist.platform.name.long>
-				<dist.platform.id>oxygen</dist.platform.id>
-				<dist.platform.version>4.7</dist.platform.version>
-				<package.qualifierPrefix>e47</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>oxygen</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/oxygen/</url>
-				</repository>
-<!--				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/oxygen/</url>
-				</repository> -->
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/</url>
-				</repository>
-				<repository>
-					<id>lsp4j-snapshots</id>
-					<layout>p2</layout>
-					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/</url>
-				</repository>
-				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
-				</repository>
-				<repository>
-					<id>lsp4e-050-stream</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/lsp4e/0.5.x-snapshots/</url>
-				</repository>
-				<repository>
-					<id>tm4e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tm4e/snapshots/</url>
-				</repository>
-			</repositories>
-		</profile>
-
-		<profile>
-			<id>e48</id>
-			<properties>
-				<dist.target>e4.8.0</dist.target>
-				<dist.target.major>e4.8</dist.target.major>
-				<dist.platform.name>Photon</dist.platform.name>
-				<dist.platform.name.long>Photon (4.8)</dist.platform.name.long>
-				<dist.platform.id>photon</dist.platform.id>
-				<dist.platform.version>4.8</dist.platform.version>
-				<package.qualifierPrefix>e48</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>photon</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/photon/</url>
-				</repository>
-				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/photon/</url>
-				</repository>
-<!--				<repository>
-					<id>platform-i-builds</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/eclipse/updates/4.8-I-builds/</url>
-				</repository> -->
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</url>
-				</repository>
-<!--				<repository>
-					<id>orbit-i-builds</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</url>
-				</repository> -->
-<!--				<repository>
-					<id>lsp4j-snapshots</id>
-					<layout>p2</layout>
-					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/</url>
-				</repository> -->
-				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-				<repository>
-					<id>tm4e</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tm4e/snapshots/</url>
-				</repository>
-			</repositories>
-		</profile>
-
 		<profile>
 			<id>e49</id>
 			<properties>
@@ -229,11 +119,6 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/releases/2018-09/</url>
 				</repository>
-<!--				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/2018-09/</url>
-				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
@@ -242,18 +127,18 @@
 <!--				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
+					<url>http://dist.springframework.org/release/IDE/3.9.6.RELEASE</url>
 				</repository> -->
 				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>http://dist.springframework.org/release/IDE/3.9.6.RELEASE</url>
+					<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
 				</repository>
-<!--				<repository>
+				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository> -->
+				</repository>
 				<repository>
 					<id>tm4e</id>
 					<layout>p2</layout>
diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml
index 69e7c7608..a3ef3fc0c 100644
--- a/headless-services/bosh-language-server/pom.xml
+++ b/headless-services/bosh-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
diff --git a/headless-services/commons/commons-boot-app-cli/pom.xml b/headless-services/commons/commons-boot-app-cli/pom.xml
index c43086c58..f6492e18f 100644
--- a/headless-services/commons/commons-boot-app-cli/pom.xml
+++ b/headless-services/commons/commons-boot-app-cli/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/commons-cf/pom.xml b/headless-services/commons/commons-cf/pom.xml
index ea4eeede2..7433f481e 100644
--- a/headless-services/commons/commons-cf/pom.xml
+++ b/headless-services/commons/commons-cf/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -36,4 +36,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml
index d6444746a..a20822830 100644
--- a/headless-services/commons/commons-gradle/pom.xml
+++ b/headless-services/commons/commons-gradle/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -51,4 +51,4 @@
 		</dependency>
 	</dependencies>
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/commons/commons-java/pom.xml b/headless-services/commons/commons-java/pom.xml
index c0b40604a..ff2e5997b 100644
--- a/headless-services/commons/commons-java/pom.xml
+++ b/headless-services/commons/commons-java/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -41,4 +41,4 @@
 		    <version>${reactor-version}</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/commons/commons-language-server/pom.xml b/headless-services/commons/commons-language-server/pom.xml
index d82a6eb60..2af70d001 100644
--- a/headless-services/commons/commons-language-server/pom.xml
+++ b/headless-services/commons/commons-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/commons-maven/pom.xml b/headless-services/commons/commons-maven/pom.xml
index 930c6e50f..8b41385c2 100644
--- a/headless-services/commons/commons-maven/pom.xml
+++ b/headless-services/commons/commons-maven/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/commons-util/pom.xml b/headless-services/commons/commons-util/pom.xml
index 69234750b..088c0db70 100644
--- a/headless-services/commons/commons-util/pom.xml
+++ b/headless-services/commons/commons-util/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/commons-yaml/pom.xml b/headless-services/commons/commons-yaml/pom.xml
index 8e7583a05..48dcd3842 100644
--- a/headless-services/commons/commons-yaml/pom.xml
+++ b/headless-services/commons/commons-yaml/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/java-properties/pom.xml b/headless-services/commons/java-properties/pom.xml
index f182f9a9f..e96daa6d2 100644
--- a/headless-services/commons/java-properties/pom.xml
+++ b/headless-services/commons/java-properties/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -47,4 +47,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/commons/language-server-starter/pom.xml b/headless-services/commons/language-server-starter/pom.xml
index c8e0212c3..e6e297a5e 100644
--- a/headless-services/commons/language-server-starter/pom.xml
+++ b/headless-services/commons/language-server-starter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/commons/language-server-test-harness/pom.xml b/headless-services/commons/language-server-test-harness/pom.xml
index 4283dd3f0..ae8d198b7 100644
--- a/headless-services/commons/language-server-test-harness/pom.xml
+++ b/headless-services/commons/language-server-test-harness/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
@@ -41,4 +41,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index d780a60ec..60632cdc8 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.springframework.ide.vscode</groupId>
 	<artifactId>commons-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>commons-parent</name>
 
 	<parent>
diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml
index 55e977b75..d64284657 100644
--- a/headless-services/concourse-language-server/pom.xml
+++ b/headless-services/concourse-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/test-projects/maven-with-jar-dependency/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/test-projects/maven-with-jar-dependency/pom.xml
index a9755817b..b0d1fc34e 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/test-projects/maven-with-jar-dependency/pom.xml
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/test-projects/maven-with-jar-dependency/pom.xml
@@ -19,4 +19,4 @@
 			<version>1.3.2</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml
index a1bfa4d2c..c1d3feece 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml
@@ -15,4 +15,4 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/pom.xml
index 6dbebe6f0..c78c54274 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/pom.xml
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/pom.xml
@@ -15,4 +15,4 @@
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-</project>
\ No newline at end of file
+</project>
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index 0bb5abb47..63b420d15 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -51,7 +51,7 @@
 			<id>jboss-apt</id>
 			<layout>p2</layout>
 			<!--URL copied from jdt.ls target platform file, needed to satisfy some of its dependencies -->
-			<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-04-06_03-47-50-H10</url>
+			<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-08-14_20-24-39-H12/</url>
 		</repository>
 	</repositories>
 	<build>
diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml
index 528ed8cfa..d3a0c1307 100644
--- a/headless-services/manifest-yaml-language-server/pom.xml
+++ b/headless-services/manifest-yaml-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 
diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
index c105f0693..83f9cd0a0 100644
--- a/headless-services/spring-boot-language-server/pom.xml
+++ b/headless-services/spring-boot-language-server/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 
diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json
index ffb0be5cf..fce277e07 100644
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -3,7 +3,7 @@
   "displayName": "Bosh Editor",
   "description": "Provides validation and content assist for various Bosh configuration files",
   "icon": "icon.png",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index 72043784f..2d7460d21 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -3,7 +3,7 @@
   "displayName": "Concourse CI Pipeline Editor",
   "description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files",
   "icon": "icon.png",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json
index 4ed4f4b95..deb556568 100644
--- a/vscode-extensions/vscode-manifest-yaml/package.json
+++ b/vscode-extensions/vscode-manifest-yaml/package.json
@@ -3,7 +3,7 @@
   "displayName": "Cloudfoundry Manifest YML Support",
   "description": "Adds linting, content assist and hoverinfo's for Cloudfoundry Deployment Manifests (a.k.a. `manifest.yml`) files.",
   "icon": "icon.png",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json
index c20ea83fc..af0420ed9 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -3,7 +3,7 @@
   "displayName": "Spring Boot Tools",
   "description": "Provides validation and content assist for Spring Boot `application.properties`, `application.yml` properties files. As well as Boot-specific support for `.java` files.",
   "icon": "spring-boot-logo.png",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",