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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7472422234 Improve the --add-opens hack for Java 8
7472422234 is described below
commit 7472422234d83841ed3621091fa67ef9429f53a5
Author: remm <[email protected]>
AuthorDate: Thu Jun 20 12:02:15 2024 +0200
Improve the --add-opens hack for Java 8
---
build.xml | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index ec969d0cfe..412576fc59 100644
--- a/build.xml
+++ b/build.xml
@@ -1978,11 +1978,21 @@
</condition>
</target>
- <property name="opens.javalang"
value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
- <property name="opens.javaio"
value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
- <property name="opens.sunrmi"
value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/>
- <property name="opens.javautil"
value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
- <property name="opens.javautilconcurrent"
value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
+ <condition property="opens.javalang"
value="--add-opens=java.base/java.lang=ALL-UNNAMED" else="-Dtest10=1">
+ <javaversion atleast="9"/>
+ </condition>
+ <condition property="opens.javaio"
value="--add-opens=java.base/java.io=ALL-UNNAMED" else="-Dtest11=1">
+ <javaversion atleast="9"/>
+ </condition>
+ <condition property="opens.sunrmi"
value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" else="-Dtest12=1">
+ <javaversion atleast="9"/>
+ </condition>
+ <condition property="opens.javautil"
value="--add-opens=java.base/java.util=ALL-UNNAMED" else="-Dtest13=1">
+ <javaversion atleast="9"/>
+ </condition>
+ <condition property="opens.javautilconcurrent"
value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
else="-Dtest14=1">
+ <javaversion atleast="9"/>
+ </condition>
<macrodef name="runtests"
description="Runs the unit tests using the specified connector.
@@ -2824,7 +2834,7 @@ asf.ldap.username=${release.asfusername}
<target name="release-version-check" >
<fail message="Release builds must use Java version ${build.java.version}
or newer (${java.version} is installed)">
<condition>
- <not><javaversion atleast="${build.java.version}" /></not>
+ <not><javaversion atleast="${release.java.version}" /></not>
</condition>
</fail>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
