From 950be06122cbb0ec30a9962948ee2e910c7ef2bd Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Thu, 1 Nov 2018 13:19:31 +0100
Subject: [PATCH] removing old eclipse platform definitions and added
 definition for distribution build on Eclipse 2018-12

---
 .../org.springframework.boot.ide.product      |   4 +
 .../p2.inf                                    |  16 +-
 .../pom.xml                                   |   2 +-
 ...spring-tool-suite-4-dmg-config-e4.10.json} |   0
 .../.project                                  |  17 --
 .../org.springframework.boot.ide.product      | 110 -------
 .../p2.inf                                    |  15 -
 .../pom.xml                                   | 276 -----------------
 .../spring-tool-suite-4-dmg-config-e4.8.json  |  10 -
 .../category.xml                              |  33 ++-
 .../pom.xml                                   |   2 +-
 .../.project                                  |  17 --
 .../category.xml                              | 171 -----------
 .../pom.xml                                   | 153 ----------
 eclipse-distribution/pom.xml                  | 279 ++++++------------
 eclipse-language-servers/pom.xml              | 123 +-------
 16 files changed, 121 insertions(+), 1107 deletions(-)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e48 => org.springframework.boot.ide.product.e410}/org.springframework.boot.ide.product (96%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e48 => org.springframework.boot.ide.product.e410}/p2.inf (82%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e48 => org.springframework.boot.ide.product.e410}/pom.xml (99%)
 rename eclipse-distribution/{org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json => org.springframework.boot.ide.product.e410/spring-tool-suite-4-dmg-config-e4.10.json} (100%)
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e47/.project
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e47/p2.inf
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e48/spring-tool-suite-4-dmg-config-e4.8.json
 rename eclipse-distribution/{org.springframework.boot.ide.repository.e48 => org.springframework.boot.ide.repository.e410}/category.xml (92%)
 rename eclipse-distribution/{org.springframework.boot.ide.repository.e48 => org.springframework.boot.ide.repository.e410}/pom.xml (99%)
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.repository.e47/.project
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.repository.e47/pom.xml

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.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/pom.xml b/eclipse-distribution/pom.xml
index 22df10744..01f25b0bf 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -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-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 1edd5af5a..87ae5c90e 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -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>