This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dc1c15009a815045a95e549f282d1d3bb21cb67c Author: remm <[email protected]> AuthorDate: Tue Dec 15 11:10:07 2020 +0100 Add opens for Java 16 --- bin/catalina.bat | 1 + bin/catalina.sh | 1 + build.xml | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/bin/catalina.bat b/bin/catalina.bat index 20cf71d..0b49723 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -239,6 +239,7 @@ set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogMa rem Configure JAVA 9 specific start-up parameters set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang=ALL-UNNAMED" set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.io=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util=ALL-UNNAMED" set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" rem Java 9 no longer supports the java.endorsed.dirs diff --git a/bin/catalina.sh b/bin/catalina.sh index 3f8e5cd..f3490a8 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -326,6 +326,7 @@ fi # Add the JAVA 9 specific start-up parameters required by Tomcat JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" export JDK_JAVA_OPTIONS diff --git a/build.xml b/build.xml index e0a2975..2c2b532 100644 --- a/build.xml +++ b/build.xml @@ -218,6 +218,10 @@ property="java9.test.option.3" value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/> <property name="java9.test.option.3" value="-Dtest.3=3"/> + <available classname="java.lang.reflect.InaccessibleObjectException" + property="java9.test.option.4" + value="--add-opens=java.base/java.util=ALL-UNNAMED"/> + <property name="java9.test.option.4" value="-Dtest.4=4"/> <!-- Classpaths --> <path id="compile.classpath"> @@ -1933,6 +1937,7 @@ <jvmarg value="${java9.test.option.1}"/> <jvmarg value="${java9.test.option.2}"/> <jvmarg value="${java9.test.option.3}"/> + <jvmarg value="${java9.test.option.4}"/> <classpath refid="tomcat.test.run.classpath" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
