[tomcat] branch main updated: Add workaround to allow running testsuite on Java 8

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 164da63  Add workaround to allow running testsuite on Java 8
164da63 is described below

commit 164da636d9414c85b29549c76bc13e09535052f7
Author: remm <r...@apache.org>
AuthorDate: Thu Feb 10 21:15:04 2022 +0100

    Add workaround to allow running testsuite on Java 8
    
    For previous branches obviously, not for Tomcat 10.1+ (commit for
    consistency).
    In build.properties, add:
    opens.javalang=-Dtest10=1
    opens.javaio=-Dtest11=1
    opens.sunrmi=-Dtest12=1
    opens.javautil=-Dtest13=1
    opens.javautilconcurrent=-Dtest14=1
---
 build.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 4417a9c..9aef252 100644
--- a/build.xml
+++ b/build.xml
@@ -1950,6 +1950,11 @@
     </and>
   </condition>
   <property name="runtests.librarypath" 
value="-Djava.library.path=${test.apr.loc}"/>
+  <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"/>
 
   <macrodef name="runtests"
             description="Runs the unit tests using the specified connector.
@@ -1976,11 +1981,11 @@
           <jvmarg value="${runtests.librarypath}"/>
           <jvmarg value="${test.formatter}"/>
           <jvmarg 
value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/>
-          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
-          <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
-          <jvmarg value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/>
-          <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
-          <jvmarg 
value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
+          <jvmarg value="${opens.javalang}"/>
+          <jvmarg value="${opens.javaio}"/>
+          <jvmarg value="${opens.sunrmi}"/>
+          <jvmarg value="${opens.javautil}"/>
+          <jvmarg value="${opens.javautilconcurrent}"/>
           <jvmarg value="${java17.nativeaccess}"/>
           <jvmarg value="${java17.addmodules}"/>
           <jvmarg value="${java17.incubatorforeign}"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org