From 0197f253da821b593b743fa35eb036426c88ed47 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Mon, 18 Oct 2021 19:35:37 +0200
Subject: [PATCH] update embedded JDK to JDK17 and include Apple Silicon M1
 support for e421 target

---
 .../pom.xml                                          | 12 +++++++++++-
 .../pom.xml                                          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
index 5b7047418..c788be079 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e421/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<dist.accessKey>${accessKey}</dist.accessKey>
 		<dist.secretKey>${secretKey}</dist.secretKey>
-		<justj.repository>https://download.eclipse.org/justj/jres/16/updates/release/latest/</justj.repository>
+		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/release/latest/</justj.repository>
 	</properties>
 
 	<build>
@@ -184,6 +184,16 @@
 							<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 ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group</appArgLine>
 						</configuration>
 					</execution>
+					<execution>
+						<id>macos-aarch64</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/aarch64/SpringToolSuite4.app -repository ${justj.repository} -installIUs org.eclipse.justj.openjdk.hotspot.jre.full.feature.group</appArgLine>
+						</configuration>
+					</execution>
 					<execution>
 						<id>windows-x86_64</id>
 						<phase>package</phase>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
index b5b41f6e2..d665e94fc 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e422/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<dist.accessKey>${accessKey}</dist.accessKey>
 		<dist.secretKey>${secretKey}</dist.secretKey>
-		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/milestone/latest/</justj.repository>
+		<justj.repository>https://download.eclipse.org/justj/jres/17/updates/release/latest/</justj.repository>
 	</properties>
 
 	<build>