From d39a48403dc13e55e36ce7747bfcd86d341ac87a Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Tue, 13 Nov 2018 18:56:01 +0100
Subject: [PATCH] modernize product definition slightly to make it build on
 Eclipse 4.10

---
 .../build.properties                          |  3 +-
 .../p2.inf                                    |  7 ++++
 .../META-INF/MANIFEST.MF                      |  1 +
 .../org.springframework.boot.ide.product      | 36 +++++++++----------
 eclipse-distribution/pom.xml                  |  2 +-
 5 files changed, 27 insertions(+), 22 deletions(-)
 create 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 64f93a9f0..3c54be93f 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties
@@ -1 +1,2 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               p2.inf
diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf b/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf
new file mode 100644
index 000000000..db72e641d
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf
@@ -0,0 +1,7 @@
+# tell pde.build not to generate start levels
+org.eclipse.pde.build.append.startlevels=false
+
+# add requirement on org.eclipse.platform.ide
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=org.eclipse.platform.ide
+requires.1.greedy=true
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 eedb0870b..ab3c43ee1 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
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.osgi.service.datalocation,
  org.osgi.framework
+Eclipse-BundleShape: dir
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 a0752deb8..67ceefda0 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
@@ -7,25 +7,28 @@
 
    <launcherArgs>
       <programArgs>-product org.springframework.boot.ide.branding.sts4
---launcher.defaultAction
-openFile</programArgs>
+--launcher.defaultAction openFile
+</programArgs>
       <vmArgs>-Dosgi.requiredJavaVersion=1.8
+-Xms256m
+-Xmx1024m
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
 --add-modules=ALL-SYSTEM
--Xms40m</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
-         <argsX86_64>-Xmx1200m</argsX86_64>
+      </vmArgs>
+      <vmArgsLin>
+      </vmArgsLin>
+      <vmArgsMac>-XstartOnFirstThread
+-Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
       </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
+      location="org.springframework.boot.ide.branding"
       startupProgressRect="0,225,455,15"
       startupMessageRect="7,220,441,20"
       startupForegroundColor="c1d72e" />
@@ -40,8 +43,8 @@ openFile</programArgs>
       <linux icon="../org.springframework.boot.ide.branding/sts4.xpm"/>
    </launcher>
 
-   <vm>
-   </vm>
+   <plugins>
+   </plugins>
 
    <features>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -95,20 +98,13 @@ openFile</programArgs>
 
       <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/pom.xml b/eclipse-distribution/pom.xml
index d212e5864..c4e20849a 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>1.1.0</tycho-version>
+		<tycho-version>1.2.0</tycho-version>
 		<encoding>UTF-8</encoding>
 	</properties>