Skip --add-opens for JDK 8

wearefrank · Mar 29, 2024 · f14928d · f14928d
1 parent 3761ce6
commit f14928d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 10 deletions.
diff --git a/ant.sh b/ant.sh
@@ -107,7 +107,6 @@ if [[ ! -d "${JDK_17_DIR}" ]]; then
 	RUN_INSTALL="true"
 fi
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 if [[ "$RUN_INSTALL" == "true" ]]; then
 	"${FR_DIR}build/apache-ant-1.10.10/bin/ant" -emacs -buildfile "${FR_DIR}build.xml" install

diff --git a/build.xml b/build.xml
@@ -712,7 +712,7 @@
 		<property name="spawn" value="true"/>
 		<java jvm="${tomcat.java.jvm}" classname="org.apache.catalina.startup.Bootstrap" fork="true" failonerror="true" spawn="${spawn}" maxmemory="${maxmemory}" if:true="${use.java}">
 			<jvmarg value="-Dcatalina.home=${tomcat.dir}"/>
-			<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><!-- Fixes classloading issue, see https://github.com/wearefrank/frank-runner/pull/86 -->
+			<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:blank="${jdk8.fallback}"/><!-- Fixes classloading issue, see https://github.com/wearefrank/frank-runner/pull/86 (this option is not available on JDK 8) -->
 			<arg value="${action}"/>
 			<classpath>
 				<fileset dir="${tomcat.dir}/bin"><include name="*.jar"/></fileset>
@@ -1096,8 +1096,7 @@ export JAVA_HOME="$${JDK_11_DIR}"</echo>
 		<echo file="${filename}.sh" append="true" if:set="fr.use.jdk.17" unless:set="mvn">
 export JAVA_HOME="$${JDK_17_DIR}"</echo>
 		<echo file="${filename}.sh" append="true" if:set="fr.use.jdk.21" unless:set="mvn">
-export JAVA_HOME="$${JDK_21_DIR}"
-</echo>
+export JAVA_HOME="$${JDK_21_DIR}"</echo>
 		<echo file="${filename}.sh" append="true" if:set="mvn">
 # ${maven.remark.line1}
 # ${maven.remark.line2}

diff --git a/env.sh b/env.sh
@@ -111,7 +111,6 @@ if [[ ! -d "${FR_DIR}build/apache-maven-3.9.5" ]]; then
 	RUN_INSTALL="true"
 fi
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 if [[ "$RUN_INSTALL" == "true" ]]; then
 	"${FR_DIR}build/apache-ant-1.10.10/bin/ant" -emacs -buildfile "${FR_DIR}build.xml" install

diff --git a/rerun.sh b/rerun.sh
@@ -98,6 +98,5 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9"
 JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7"
 JDK_21_DIR="${FR_DIR}build/jdk-21.0.2+13"
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" rerun
diff --git a/restart.sh b/restart.sh
@@ -98,6 +98,5 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9"
 JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7"
 JDK_21_DIR="${FR_DIR}build/jdk-21.0.2+13"
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" restart
diff --git a/run.sh b/run.sh
@@ -98,6 +98,5 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9"
 JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7"
 JDK_21_DIR="${FR_DIR}build/jdk-21.0.2+13"
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" run
diff --git a/start.sh b/start.sh
@@ -98,6 +98,5 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9"
 JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7"
 JDK_21_DIR="${FR_DIR}build/jdk-21.0.2+13"
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" start
diff --git a/stop.sh b/stop.sh
@@ -98,6 +98,5 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9"
 JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7"
 JDK_21_DIR="${FR_DIR}build/jdk-21.0.2+13"
 export JAVA_HOME="${JDK_21_DIR}"
-
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" stop