diff options
| -rw-r--r-- | scripts/test-utils-script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/test-utils-script b/scripts/test-utils-script index eecab8b0f..80ed0f122 100644 --- a/scripts/test-utils-script +++ b/scripts/test-utils-script @@ -44,9 +44,9 @@ checkJavaVersion() { # check java version local java_cmd=$1 local java_version_string=$(${java_cmd} -version 2>&1 | grep -E "\<version\>") - local JAVA_VERSION=$(echo "$java_version_string" | grep -E 'version [ "](1\.8|9|11|17).*[ "]') + local JAVA_VERSION=$(echo "$java_version_string" | grep -E 'version [ "](1\.8|9|11|17|21).*[ "]') if [ "${JAVA_VERSION}" == "" ]; then - >&2 echo "Wrong java version. Allowed versions: 1.8, 9, 11, 17. Found $java_version_string" + >&2 echo "Wrong java version. Allowed versions: 1.8, 9, 11, 17, 21. Found $java_version_string" >&2 echo "Java command: $java_cmd" >&2 echo "PATH value:" >&2 echo "$PATH" @@ -58,7 +58,7 @@ getAddOpensFlag() { # check if java is above 9 and supports add-opens local java_cmd=$1 local java_version_string=$(${java_cmd} -version 2>&1 | grep -E "\<version\>") - local JAVA_VERSION=$(echo "$java_version_string" | grep -E 'version [ "](9|11|17).*[ "]') + local JAVA_VERSION=$(echo "$java_version_string" | grep -E 'version [ "](9|11|17|21).*[ "]') if [ "${JAVA_VERSION}" != "" ]; then echo "--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED" fi |