Browse Source

add java.security.manager=allow while launching against Java 19

master
Jaikiran Pai 3 years ago
parent
commit
a66dafa7d5
3 changed files with 64 additions and 5 deletions
  1. +51
    -0
      java-latest-ea-ci.xml
  2. +1
    -1
      src/script/ant
  3. +12
    -4
      src/script/ant.bat

+ 51
- 0
java-latest-ea-ci.xml View File

@@ -0,0 +1,51 @@
<?xml version="1.0"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->


<!-- This build file is here to help with the CI jobs in Jenkins where we
download and run the Ant tests against the latest early access binaries of
Java -->
<project default="download-jdk">
<property environment="env"/>
<target name="download-jdk" depends="check-file-type, download-extract-zip, download-extract-tar"/>
<target name="check-file-type">
<condition property="zip-artifact">
<!-- check if it ends with .zip -->
<matches string="${env.JDK_DOWNLOAD_URL}" pattern="\.zip$"/>
</condition>
<condition property="tar-artifact">
<!-- check if it ends with .tar.gz -->
<matches string="${env.JDK_DOWNLOAD_URL}" pattern="\.tar.gz$"/>
</condition>
</target>
<target name="download-extract-zip" if="zip-artifact">
<echo message="Downloading zip file from ${env.JDK_DOWNLOAD_URL}"/>
<get src="${env.JDK_DOWNLOAD_URL}" dest="${basedir}/jdk.zip"/>
<unzip src="jdk.zip" dest="${basedir}/java-latest-ea"/>
</target>
<target name="download-extract-tar" if="tar-artifact">
<echo message="Downloading tar.gz file from ${env.JDK_DOWNLOAD_URL}"/>
<get src="${env.JDK_DOWNLOAD_URL}" dest="${basedir}/jdk.tar.gz"/>
<untar src="jdk.tar.gz" dest="${basedir}/java-latest-ea" compression="gzip"/>
<!-- restore permission on the extracted tar's bin directory contents -->
<echo message="restoring permissions of files in directory ${basedir}/java-latest-ea/**/bin/*"/>
<chmod dir="${basedir}/java-latest-ea/" perm="a+x" includes="**/bin/*"/>
</target>

</project>

+ 1
- 1
src/script/ant View File

@@ -370,7 +370,7 @@ else
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:]'`
if [ "$JAVA_SPEC_VERSION" = "java.specification.version=18" ]; then
if [ "$JAVA_SPEC_VERSION" = "java.specification.version=18" ] || [ "$JAVA_SPEC_VERSION" = "java.specification.version=19" ]; then
# set security manager property to allow calls to System.setSecurityManager() at runtime
ANT_OPTS="$ANT_OPTS -Djava.security.manager=allow"
fi


+ 12
- 4
src/script/ant.bat View File

@@ -123,11 +123,19 @@ goto setSecurityManagerOpt
if "%_JAVACMD%" == "" set _JAVACMD=java.exe

:setSecurityManagerOpt
"%_JAVACMD%" -XshowSettings:properties 2>&1 | find "java.specification.version = 18"
if %errorlevel% EQU 0 (
rem This is Java 18, so set -Djava.security.manager=allow
set ANT_OPTS=%ANT_OPTS% -Djava.security.manager=allow
setlocal EnableDelayedExpansion
"!_JAVACMD!" -XshowSettings:properties 2>&1 | find "java.specification.version = 18" >nul 2>&1
if !errorlevel! EQU 0 (
rem This is Java 18, so set -Djava.security.manager=allow
set JAVA_SECMGR_OPT=-Djava.security.manager=allow
) else (
"!_JAVACMD!" -XshowSettings:properties 2>&1 | find "java.specification.version = 19" >nul 2>&1
if !errorlevel! EQU 0 (
rem This is Java 19, so set -Djava.security.manager=allow
set JAVA_SECMGR_OPT=-Djava.security.manager=allow
)
)
endlocal & set "ANT_OPTS=%ANT_OPTS% %JAVA_SECMGR_OPT%"

:checkJikes
if not "%JIKESPATH%"=="" goto runAntWithJikes


Loading…
Cancel
Save