From 68854ece203e95d8fa21dd07ae4284061619832f Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 6 Jan 2022 00:06:52 +0100
Subject: [PATCH] add --illegal-access=permit for JDK >=11 for backward
 compatibility

---
 java/target/env.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/target/env.sh b/java/target/env.sh
index bfa05aa7777..3e1f9d87c74 100755
--- a/java/target/env.sh
+++ b/java/target/env.sh
@@ -73,14 +73,15 @@ JAVA_BINARY="$JAVA_HOME/bin/java"
 JAVA_VERSION_OUTPUT=$("$JAVA_BINARY" -version 2>&1)
 JAVA_VERSION=$(echo "$JAVA_VERSION_OUTPUT" | sed 's/^.* version "\(.*\)\.\(.*\)\..*".*$/\1.\2/; 1q')
 export JAVA_11_LOGGING_ARGS="-Xlog:gc+ergo*=trace:file=logs/gc_ergo.log:time:filecount=10,filesize=10000000 -Xlog:gc*:file=logs/gc.log:time:filecount=10,filesize=100000"
-export JAVA_11_ARGS="-Dosgi.java.profile=file://`pwd`/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -XX:ThreadPriorityPolicy=1 -XX:+UnlockExperimentalVMOptions -XX:+UseZGC ${JAVA_11_LOGGING_ARGS}"
+export JAVA_11_ARGS="-Dosgi.java.profile=file://`pwd`/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -XX:ThreadPriorityPolicy=1 -XX:+UnlockExperimentalVMOptions -XX:+UseZGC ${JAVA_11_LOGGING_ARGS} --illegal-access=permit"
 export JAVA_8_LOGGING_ARGS="-XX:+PrintAdaptiveSizePolicy -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Xloggc:logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
 echo JAVA_VERSION detected: $JAVA_VERSION >&2
-if echo $JAVA_VERSION | grep -q "^11\."; then
-  echo Java 11 detected >&2
+JAVA_MAJOR_VERSION=$( echo "${JAVA_VERSION}" | sed -e 's/^\([0-9]*\)\..*$/\1/' )
+if [ ${JAVA_MAJOR_VERSION} -ge 11 ]; then
+  echo "Java major version >=11 detected ">&2
   JAVA_VERSION_SPECIFIC_ARGS=$JAVA_11_ARGS
 else
-  echo Java other than 11 detected >&2
+  echo Java before version 11 detected >&2
   # options for use with SAP JVM only:
   if echo "$JAVA_VERSION_OUTPUT" | grep -q "SAP Java"; then
     ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -XX:+GCHistory -XX:GCHistoryFilename=logs/sapjvm_gc@PID.prf"