From 2fcd7a89fc772aa121a79c7f8b81d9789d768316 Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Sun, 8 Sep 2024 13:18:21 +0300
Subject: [PATCH 1/4] SPARK-2346 make default-jre or any other JRE for Linux
 Deb

---
 distribution/src/installer/spark.install4j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j
index 93937e2a4..d281239aa 100644
--- a/distribution/src/installer/spark.install4j
+++ b/distribution/src/installer/spark.install4j
@@ -834,7 +834,7 @@ return console.askYesNo(message, true);
       </exclude>
       <jreBundle jreBundleSource="none" />
     </linuxRPM>
-    <linuxDeb name="Linux Deb Archive" id="166" dependencies="default-jre">
+    <linuxDeb name="Linux Deb Archive" id="166" dependencies="default-jre | java-runtime (>= 8)">
       <exclude>
         <entry location="bin/startup.bat" />
         <entry location="documentation" />

From 35f8f33befa3883ad352ad51376e98fc91e8c11b Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Sun, 8 Sep 2024 13:30:44 +0300
Subject: [PATCH 2/4] SPARK-2346 Remove stdout and stderr redirection to a file

The redirection to a logs/error.log fails because it's a relative path to the program binary that is read only for a user
---
 distribution/src/installer/spark.install4j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j
index d281239aa..e86b42d92 100644
--- a/distribution/src/installer/spark.install4j
+++ b/distribution/src/installer/spark.install4j
@@ -34,7 +34,7 @@
   </files>
   <launchers>
     <launcher name="Spark" id="4" icnsFile="images/message.icns">
-      <executable name="Spark" iconSet="true" iconFile="images/spark.ico" executableDir="." stderrFile="logs/error.log" redirectStdout="true" stdoutFile="logs/output.log" executableMode="gui" singleInstance="true" serviceDescription="communicator" dpiAware="false">
+      <executable name="Spark" iconSet="true" iconFile="images/spark.ico" executableDir="." executableMode="gui" singleInstance="true" serviceDescription="communicator" dpiAware="false">
         <versionInfo include="true" fileDescription="${compiler:sys.shortName}" legalCopyright="${compiler:sys.publisher}" internalName="${compiler:sys.shortName}" />
       </executable>
       <java mainClass="org.jivesoftware.launcher.Startup" vmParameters="&quot;-Dappdir=${launcher:sys.launcherDirectory}&quot; -Dsun.java2d.noddraw=true &quot;-Djava.library.path=${launcher:sys.launcherDirectory}\lib\windows&quot;" preferredVM="client">

From 17bb5d16e124259010a691c598bb338722aeabba Mon Sep 17 00:00:00 2001
From: ilya khlevnoy <71222850+Plyha@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:05:55 +0300
Subject: [PATCH 3/4] disable redirect stdout

---
 distribution/src/installer/spark.install4j | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j
index e86b42d92..203e7d6e1 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.3" transformSequenceNumber="10">
+<install4j version="10.0.9" transformSequenceNumber="10">
   <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">
@@ -34,7 +34,7 @@
   </files>
   <launchers>
     <launcher name="Spark" id="4" icnsFile="images/message.icns">
-      <executable name="Spark" iconSet="true" iconFile="images/spark.ico" executableDir="." executableMode="gui" singleInstance="true" serviceDescription="communicator" dpiAware="false">
+      <executable name="Spark" iconSet="true" iconFile="images/spark.ico" executableDir="." redirectStderr="false" executableMode="gui" singleInstance="true" serviceDescription="communicator" dpiAware="false">
         <versionInfo include="true" fileDescription="${compiler:sys.shortName}" legalCopyright="${compiler:sys.publisher}" internalName="${compiler:sys.shortName}" />
       </executable>
       <java mainClass="org.jivesoftware.launcher.Startup" vmParameters="&quot;-Dappdir=${launcher:sys.launcherDirectory}&quot; -Dsun.java2d.noddraw=true &quot;-Djava.library.path=${launcher:sys.launcherDirectory}\lib\windows&quot;" preferredVM="client">

From 8dc297684463f9bda88abcec5497b3e7f44f0be5 Mon Sep 17 00:00:00 2001
From: ilya khlevnoy <71222850+Plyha@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:14:52 +0300
Subject: [PATCH 4/4] add param via install4j IDE

---
 distribution/src/installer/spark.install4j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j
index 203e7d6e1..c83784223 100644
--- a/distribution/src/installer/spark.install4j
+++ b/distribution/src/installer/spark.install4j
@@ -834,7 +834,7 @@ return console.askYesNo(message, true);
       </exclude>
       <jreBundle jreBundleSource="none" />
     </linuxRPM>
-    <linuxDeb name="Linux Deb Archive" id="166" dependencies="default-jre | java-runtime (>= 8)">
+    <linuxDeb name="Linux Deb Archive" id="166" dependencies="default-jre | java-runtime (&gt;= 8)">
       <exclude>
         <entry location="bin/startup.bat" />
         <entry location="documentation" />