This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4b3f70a977 Fix BZ 66323 - switch from JDK_JAVA_OPTIONS to JAVA_OPTS
4b3f70a977 is described below
commit 4b3f70a9774df406a0ef5f6abbfe44b34855115a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 27 11:18:13 2022 +0100
Fix BZ 66323 - switch from JDK_JAVA_OPTIONS to JAVA_OPTS
---
bin/catalina.bat | 10 +++++-----
bin/catalina.sh | 11 +++++------
webapps/docs/changelog.xml | 5 +++++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index 8ef19fe352..824773b460 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -218,11 +218,11 @@ set
LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogMa
:noJuliManager
rem Configure module 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.base/java.util.concurrent=ALL-UNNAMED"
-set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS%
--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.lang=ALL-UNNAMED"
+set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.io=ALL-UNNAMED"
+set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util=ALL-UNNAMED"
+set "JAVA_OPTS=%JAVA_OPTS%
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
+set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
rem ----- Execute The Requested Command ---------------------------------------
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 1bf92a90ec..a15accbdb5 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -291,12 +291,11 @@ if [ "$USE_NOHUP" = "true" ]; then
fi
# Add the module 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.base/java.util.concurrent=ALL-UNNAMED"
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS
--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
-export JDK_JAVA_OPTIONS
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
# ----- Execute The Requested Command -----------------------------------------
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7ab72a5200..41a92dd858 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,11 @@
<update>
Update to Commons Daemon 1.3.2. (markt)
</update>
+ <fix>
+ <bug>66323</bug>: Move module start up parameters from
+ <code>JDK_JAVA_OPTIONS</code> to <code>JAVA_OPTS</code> now that the
+ minimum Java version is 11 and these options are always required.
(markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
