Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Cleanup Java21 arguments (#29756) #29758

Merged
merged 1 commit into from
Aug 27, 2024
Merged

chore: Cleanup Java21 arguments (#29756) #29758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export LANG=${LANG:-"C.UTF-8"}

export TOMCAT_HOME=/srv/dotserver/tomcat
# JAVA args to pass to the Tomcat JVM
export JAVA_OPTS_BASE=${JAVA_OPTS_BASE:-"-Djava.awt.headless=true -Xverify:none -Dfile.encoding=UTF8 -server -Dpdfbox.fontcache=/data/local/dotsecure -Dlog4j2.formatMsgNoLookups=true -Djava.library.path=/usr/lib/$( uname -m )-linux-gnu/ -XX:+UseShenandoahGC -XX:+UnlockExperimentalVMOptions -XX:ShenandoahUncommitDelay=1000 -XX:ShenandoahGuaranteedGCInterval=10000 "}
export JAVA_OPTS_BASE=${JAVA_OPTS_BASE:-"-Djava.awt.headless=true -Dfile.encoding=UTF8 -server -Dpdfbox.fontcache=/data/local/dotsecure -Dlog4j2.formatMsgNoLookups=true -Djava.library.path=/usr/lib/$( uname -m )-linux-gnu/ -XX:+UseShenandoahGC -XX:+UnlockExperimentalVMOptions -XX:ShenandoahUncommitDelay=1000 -XX:ShenandoahGuaranteedGCInterval=10000 "}
export JAVA_OPTS_MEMORY=${JAVA_OPTS_MEMORY:-"-Xmx1G"}

# $CMS_JAVA_OPTS is last so it trumps them all
Expand Down
2 changes: 1 addition & 1 deletion dotCMS/src/main/resources/container/tomcat9/bin/setenv.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

rem Set CATALINA_OPTS with multiple options
set "CATALINA_OPTS=%CATALINA_OPTS% -Dfile.encoding=UTF8"
set "CATALINA_OPTS=%CATALINA_OPTS% --illegal-access=deny"

set "CATALINA_OPTS=%CATALINA_OPTS% --add-opens java.base/java.lang=ALL-UNNAMED"
set "CATALINA_OPTS=%CATALINA_OPTS% --add-opens java.base/java.io=ALL-UNNAMED"
set "CATALINA_OPTS=%CATALINA_OPTS% --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"
Expand Down
1 change: 0 additions & 1 deletion dotCMS/src/main/resources/container/tomcat9/bin/setenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh

export CATALINA_OPTS="$CATALINA_OPTS -Dfile.encoding=UTF8"
export CATALINA_OPTS="$CATALINA_OPTS --illegal-access=deny"
export CATALINA_OPTS="$CATALINA_OPTS --add-opens java.base/java.lang=ALL-UNNAMED"
export CATALINA_OPTS="$CATALINA_OPTS --add-opens java.base/java.io=ALL-UNNAMED"
export CATALINA_OPTS="$CATALINA_OPTS --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"
Expand Down
2 changes: 0 additions & 2 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<java.module.args>
--illegal-access=deny
--add-modules java.se
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
Expand Down Expand Up @@ -861,7 +860,6 @@
<forkCount>${surefire.fork.count}</forkCount>
<reuseForks>true</reuseForks>
<argLine>@{argLine} -Xmx1024m
--illegal-access=deny
${java.module.args}
</argLine>

Expand Down
Loading