From 47ab88352f94ad00a572725460d740163606f2a6 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Thu, 15 Nov 2018 14:34:02 +0100
Subject: [PATCH] final steps to make product generation, signing, and startup
 work again on Eclipse 4.10

---
 .../build.properties                               |  4 ++--
 .../p2.inf                                         |  2 --
 .../org.springframework.boot.ide.product           | 14 ++++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties b/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties
index 3c54be93f..0658d02e0 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = feature.xml,\
-               p2.inf
+bin.includes = feature.xml
+includeLaunchers=false
\ No newline at end of file
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf b/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf
deleted file mode 100644
index 632e9d552..000000000
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-# tell pde.build not to generate start levels
-org.eclipse.pde.build.append.startlevels=false
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
index 67ceefda0..a73b4bd1c 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
@@ -47,7 +47,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.platform" installMode="root"/>
+      <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.pde" installMode="root"/>
 
       <feature id="org.eclipse.buildship" installMode="root"/>
@@ -88,7 +88,7 @@
       <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.branding.feature"/>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
@@ -100,11 +100,17 @@
       <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}"/>
+
+   	  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   	  <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.event" autoStart="true" startLevel="2" />
+   	  <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+   	  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+   	  <plugin id="org.eclipse.update.configurator" autoStart="false" startLevel="4" />
    </configurations>
 
-
 </product>