Merge branch 'master' into issue-28944-uve-enable-inline-editing-in-t…

…ext-fields-for-react-sdk
dotCMS · Aug 27, 2024 · c504bc6 · c504bc6
2 parents ac3b9db + a40ca94
commit c504bc6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh b/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh
@@ -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

diff --git a/dotCMS/src/main/resources/container/tomcat9/bin/setenv.bat b/dotCMS/src/main/resources/container/tomcat9/bin/setenv.bat
@@ -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"

diff --git a/dotCMS/src/main/resources/container/tomcat9/bin/setenv.sh b/dotCMS/src/main/resources/container/tomcat9/bin/setenv.sh
@@ -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"

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -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
@@ -861,7 +860,6 @@
                         <forkCount>${surefire.fork.count}</forkCount>
                         <reuseForks>true</reuseForks>
                         <argLine>@{argLine} -Xmx1024m
-                            --illegal-access=deny
                             ${java.module.args}
                         </argLine>