From d2d39fe4007b1ebf55572a8935974f4155e9f38d Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Thu, 27 May 2021 18:10:27 +0200
Subject: [PATCH] change the way the jre feature is installed to exclude it
 from the repo and to allow for platform-specific installs

---
 .../org.springframework.boot.ide.product      |   2 +-
 .../pom.xml                                   | 107 ++++++++++++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e420/org.springframework.boot.ide.product
index 0d785c948..f3c19faee 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e420/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e420/org.springframework.boot.ide.product
@@ -114,7 +114,7 @@
       <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
       <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
 
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
+<!--      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/> -->
       
 <!--      <feature id="com.make.chromium.cef.feature" installMode="root"/> -->
 </features>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
index 74ec6931a..3be2c6b26 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
@@ -98,6 +98,113 @@
 					</formats>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-eclipserun-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<repositories>
+						<repository>
+							<id>2021-06</id>
+							<layout>p2</layout>
+							<url>https://download.eclipse.org/releases/2021-06</url>
+						</repository>
+					</repositories>
+					<argLine>-Declipse.p2.mirrors=false</argLine>
+					<dependencies>
+						<dependency>
+							<artifactId>org.eclipse.pde.api.tools</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.pde.build</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.pde.core</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.launcher</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>javax.annotation</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.repository</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.touchpoint.natives</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.artifact.repository
+							</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.p2.director.app</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.equinox.ds</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+						<dependency>
+							<artifactId>org.eclipse.core.net</artifactId>
+							<type>eclipse-plugin</type>
+						</dependency>
+					</dependencies>
+				</configuration>
+				<executions>
+					<execution>
+						<id>macos-x86_64</id>
+						<phase>package</phase>
+						<goals>
+							<goal>eclipse-run</goal>
+						</goals>
+						<configuration>
+							<appArgLine>-consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app -repository https://download.eclipse.org/justj/jres/15/updates/release/latest/ -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group</appArgLine>
+						</configuration>
+					</execution>
+					<execution>
+						<id>windows-x86_64</id>
+						<phase>package</phase>
+						<goals>
+							<goal>eclipse-run</goal>
+						</goals>
+						<configuration>
+							<appArgLine>-consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} -repository https://download.eclipse.org/justj/jres/15/updates/release/latest/ -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group</appArgLine>
+						</configuration>
+					</execution>
+					<execution>
+						<id>linux_x86_64</id>
+						<phase>package</phase>
+						<goals>
+							<goal>eclipse-run</goal>
+						</goals>
+						<configuration>
+							<appArgLine>-consoleLog -application org.eclipse.equinox.p2.director -nosplash -destination ${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier} -repository https://download.eclipse.org/justj/jres/15/updates/release/latest/ -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group</appArgLine>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>