From 0b33c8997ac5144af8a515ca1dbcfc73dff1be19 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 14 Nov 2018 09:21:44 +0100
Subject: [PATCH] revert changes to product definition to identify and isolate
 macos signing issues

---
 .../org.springframework.boot.ide.product      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

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..a0752deb8 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,28 +7,25 @@
 
    <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
-      </vmArgs>
-      <vmArgsLin>
-      </vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
+-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
-      location="org.springframework.boot.ide.branding"
       startupProgressRect="0,225,455,15"
       startupMessageRect="7,220,441,20"
       startupForegroundColor="c1d72e" />
@@ -43,8 +40,8 @@
       <linux icon="../org.springframework.boot.ide.branding/sts4.xpm"/>
    </launcher>
 
-   <plugins>
-   </plugins>
+   <vm>
+   </vm>
 
    <features>
       <feature id="org.eclipse.platform" installMode="root"/>
@@ -98,13 +95,20 @@
 
       <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
       <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
-   </features>
 
+   </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>