From f7eaa0dac0888627b2427c2ccf06b61f46039f8b Mon Sep 17 00:00:00 2001
From: akrherz <akrherz@iastate.edu>
Date: Thu, 12 Jun 2025 10:20:23 -0500
Subject: [PATCH] SPARK-2348 Install4J 11.0.4 Updates

- EJ-Technologies custom maven repo no longer needed
- Allowed GUI to update config schema
---
 core/pom.xml                               | 9 +--------
 distribution/pom.xml                       | 7 -------
 distribution/src/installer/spark.install4j | 6 +++---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index f3a82fe8..30f7fdd8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -239,7 +239,7 @@
         <dependency>
             <groupId>com.install4j</groupId>
             <artifactId>install4j-runtime</artifactId>
-            <version>10.0.9</version>
+            <version>11.0.4</version>
         </dependency>
 
         <dependency>
@@ -293,13 +293,6 @@
         </dependency>
     </dependencies>
     
-    <repositories>
-        <repository>
-            <id>ej-technologies</id>
-            <url>https://maven.ej-technologies.com/repository/</url>
-        </repository>
-    </repositories>
-
     <profiles>
         <profile>
             <id>owasp-check</id>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1fcc0ec9..8ca0831d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -37,13 +37,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>ej-technologies</id>
-            <url>https://maven.ej-technologies.com/repository/</url>
-        </repository>
-    </repositories>
-
     <profiles>
         <profile>
             <id>install4j</id>
diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j
index 09524bce..3fe6d00e 100644
--- a/distribution/src/installer/spark.install4j
+++ b/distribution/src/installer/spark.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="10.0.9" transformSequenceNumber="10">
+<install4j version="11.0.4" transformSequenceNumber="11">
   <directoryPresets config="../../target/distribution-base/lib" />
   <application name="Spark" applicationId="3057-7228-2063-7466" mediaDir="../../target/" mediaFilePattern="spark_${compiler:sys.version}" compression="9" lzmaCompression="true" commonExternalFiles="true" shortName="Spark" publisher="Ignite Realtime" publisherWeb="http://www.igniterealtime.org" version="3.0.0" allPathsRelative="true" macVolumeId="ccfadd9e467a1ebd" javaMinVersion="1.8" jdkMode="runtimeJre">
     <languages skipLanguageSelection="true">
@@ -861,7 +861,7 @@ return console.askYesNo(message, true);
       </exclude>
       <jreBundle jreBundleSource="none" />
     </linuxDeb>
-    <macosArchive name="MacOS Single Bundle Archive" id="213" launcherId="4">
+    <macosArchive name="MacOS Single Bundle Archive" id="213" architecture="amd64" launcherId="4">
       <exclude>
         <entry location="bin/startup.bat" />
         <entry location="documentation" />
@@ -876,7 +876,7 @@ return console.askYesNo(message, true);
       </exclude>
       <jreBundle jreBundleSource="none" />
     </macosArchive>
-    <macosArchive name="MacOS Single Bundle Archive (with JRE)" id="217" mediaFileName="spark_${compiler:sys.version}-with-jre" launcherId="4">
+    <macosArchive name="MacOS Single Bundle Archive (with JRE)" id="217" mediaFileName="spark_${compiler:sys.version}-with-jre" architecture="amd64" launcherId="4">
       <exclude>
         <entry location="bin/startup.bat" />
         <entry location="documentation" />