From 2e9a704ce82a9f8f0df2e490f16dae96c4551abd Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Mon, 4 Apr 2022 15:44:18 +0200
Subject: clean up mac profiles + add mac JRE

---
 pdf-over-gui/pom.xml | 50 ++++++++++----------------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

(limited to 'pdf-over-gui')

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index af13f84d..dda9803e 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -511,45 +511,6 @@
 		</profile>
 		<profile>
 			<id>mac</id>
-			<activation>
-				<os>
-					<name>mac os x</name>
-					<arch>x86</arch>
-				</os>
-			</activation>
-			<properties>
-				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
-				<target.name>mac</target.name>
-			</properties>
-		</profile>
-		<profile>
-			<id>mac-2</id>
-			<activation>
-				<os>
-					<name>mac os x</name>
-					<arch>i386</arch>
-				</os>
-			</activation>
-			<properties>
-				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
-				<target.name>mac</target.name>
-			</properties>
-		</profile>
-		<profile>
-			<id>mac-64</id>
-			<activation>
-				<os>
-					<name>mac os x</name>
-					<arch>amd64</arch>
-				</os>
-			</activation>
-			<properties>
-				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
-				<target.name>mac</target.name>
-			</properties>
-		</profile>
-		<profile>
-			<id>mac-64-2</id>
 			<activation>
 				<os>
 					<family>mac</family>
@@ -562,10 +523,13 @@
 			</activation>
 			<properties>
 				<swt.artifactId>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId>
+				<bundled-jre.archiveName>OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz</bundled-jre.archiveName>
+				<bundled-jre.nameInArchive>jdk-11.0.14.1+1-jre</bundled-jre.nameInArchive>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
         <profile>
+			<!-- this profile is not yet specified in publish.sh; there is no openjdk11 for aarch64, and SWT needs adding to internal mvn -->
 			<id>mac-aarch64</id>
 			<activation>
 				<os>
@@ -579,6 +543,8 @@
 			</activation>
 			<properties>
 				<swt.artifactId>org.eclipse.swt.cocoa.macosx.aarch64</swt.artifactId>
+				<bundled-jre.archiveName>OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz</bundled-jre.archiveName>
+				<bundled-jre.nameInArchive>jdk-17.0.2+8-jre</bundled-jre.nameInArchive>
 				<target.name>mac</target.name>
 			</properties>
 		</profile>
@@ -634,7 +600,11 @@
 		</profile>
 		<profile>
 			<id>ks-sign</id>
-			<!-- Activate this profile to sign the package using a java keystore -->
+			<activation>
+				<property>
+					<name>ks-file</name>
+				</property>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>
-- 
cgit v1.2.3