Browse Source

Fix detection of java.specification.version

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
master
Keith W. Campbell 2 years ago
parent
commit
c8f579577d
No known key found for this signature in database GPG Key ID: 35CA56608D92860D
1 changed files with 12 additions and 5 deletions
  1. +12
    -5
      src/script/ant

+ 12
- 5
src/script/ant View File

@@ -369,11 +369,18 @@ else
fi
fi
# Run "java -XshowSettings:properties" and check the output for "java.specification.version" value
JAVA_SPEC_VERSION=$("$JAVACMD" -XshowSettings:properties 2>&1 | grep "java.specification.version = " | tr -d '[:space:]java.specification.version=')
if [ "$JAVA_SPEC_VERSION" -ge 18 ]; then
# set security manager property to allow calls to System.setSecurityManager() at runtime
ANT_OPTS="$ANT_OPTS -Djava.security.manager=allow"
fi
JAVA_SPEC_VERSION=$("$JAVACMD" -XshowSettings:properties 2>&1 | sed -n -e 's/[[:space:]]//g' -e 's/^java\.specification\.version=//p')
case "$JAVA_SPEC_VERSION" in
1.*)
# Up to and including Java 8, versions are reported as 1.N.
;;
*)
if [ "$JAVA_SPEC_VERSION" -ge 18 ]; then
# set security manager property to allow calls to System.setSecurityManager() at runtime
ANT_OPTS="$ANT_OPTS -Djava.security.manager=allow"
fi
;;
esac
ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
if $ant_exec_debug; then
# using printf to avoid echo line continuation and escape interpretation confusion


Loading…
Cancel
Save