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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new df0f798  Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat
df0f798 is described below

commit df0f798ae51554b56d6d5985d1fb1c351b47107b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 16 15:00:35 2021 +0100

    Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat
    
    https://bz.apache.org/bugzilla/show_bug.cgi?id=65369
---
 bin/service.bat            | 2 +-
 webapps/docs/changelog.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/service.bat b/bin/service.bat
index b6a2d86..a1ab56d 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -226,7 +226,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" (
     --StartParams start ^
     --StopParams stop ^
     --JvmOptions 
"-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-D%ENDORSED_PROP%=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%"
 ^
-    --JvmOptions9 
"--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
 ^
+    --JvmOptions9 
"--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.base/java.util=ALL-UNNAMED#--add-opens=java.base/java.util.concurrent=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
 ^
     --Startup "%SERVICE_STARTUP_MODE%" ^
     --JvmMs "%JvmMs%" ^
     --JvmMx "%JvmMx%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8233e4b..0d0070e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,12 @@
         Update to the Java 7 compatible build of JSign 3.1 to pick up a fix for
         SHA-512 signatures. (markt)
       </update>
+      <fix>
+        <bug>65369</bug> / <pr>422</pr>: Add the additional
+        <code>--add-opens=...</code> options required for running Tomcat on 
Java
+        16 onwards to the <code>service.bat</code> script to align it with the
+        other start-up scripts. PR provided by MCMicS. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>

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

Reply via email to