Skip to content

Commit

Permalink
Merge pull request #277 from ddiroma/40660
Browse files Browse the repository at this point in the history 
[BACKLOG-40660] 10.2 - JDK17 - All startup scripts to add '--add-open…
  • Loading branch information
@peterrinehart
peterrinehart authored May 8, 2024
2 parents 2ab0ba1 + 209c056 commit 135bda1
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 29 deletions.
34 changes: 20 additions & 14 deletions assemblies/pme-ce/src/main/resources-filtered/metadata-editor.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,26 @@ if "%PENTAHO_JAVA_OPTIONS%"=="" set PENTAHO_JAVA_OPTIONS="-Xms1024m" "-Xmx2048m"

set OPT=%PENTAHO_JAVA_OPTIONS% "-Djava.library.path=%LIBSPATH%"
set JAVA_ADD_OPENS=
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.file=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.http=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.base/sun.reflect.misc=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.management/javax.management=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.management/javax.management.openmbean=ALL-UNNAMED"
set "JDK_ADD_OPENS=%JDK_ADD_OPENS% --add-opens java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
set OPT=%OPT% %JDK_ADD_OPENS% "-Djava.locale.providers=COMPAT,SPI"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/java.io=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.net=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.security=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens=java.base/java.util=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.file=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.http=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.reflect.misc=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.management/javax.management=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.management/javax.management.openmbean=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/java.math=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/java.lang.Object=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/sun.nio.ch=ALL-UNNAMED"
set "JAVA_ADD_OPENS=%JAVA_ADD_OPENS% --add-opens java.base/java.nio=ALL-UNNAMED"
set OPT=%OPT% %JAVA_ADD_OPENS% "-Djava.locale.providers=COMPAT,SPI"

rem **** USE THIS LINE IF REMOTE DEBUGGING (port 5105) IS REQUIRED***
REM set OPT=%OPT% -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5105
Expand Down
37 changes: 22 additions & 15 deletions assemblies/pme-ce/src/main/resources-filtered/metadata-editor.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,27 @@ export LIBPATH

OPT="-Xms1024m -Xmx2048m -Djava.library.path=$LIBPATH $OPT"

JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens=java.base/java.lang=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens=java.base/java.net=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens=java.base/java.security=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.base/sun.net.www.protocol.file=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.base/sun.net.www.protocol.http=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.base/sun.reflect.misc=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.management/javax.management=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.management/javax.management.openmbean=ALL-UNNAMED"
JDK_ADD_OPENS="$JDK_ADD_OPENS --add-opens java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
OPT="$OPT $JDK_ADD_OPENS -Djava.locale.providers=COMPAT,SPI"
JAVA_ADD_OPENS=
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.lang=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.io=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.net=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.security=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens=java.base/java.util=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.net.www.protocol.file=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.net.www.protocol.ftp=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.net.www.protocol.http=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.reflect.misc=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.management/javax.management=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.management/javax.management.openmbean=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/java.math=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/java.lang.Object=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/sun.nio.ch=ALL-UNNAMED"
JAVA_ADD_OPENS="$JAVA_ADD_OPENS --add-opens java.base/java.nio=ALL-UNNAMED"
OPT="$OPT $JAVA_ADD_OPENS -Djava.locale.providers=COMPAT,SPI"


# ***************
Expand All @@ -148,4 +155,4 @@ if [ $OS = "linux" ]; then
"$_PENTAHO_JAVA" $OPT $STARTUP -lib $LIBPATH "${1+$@}" 2>&1 | grep -viE "Gtk-WARNING|GLib-GObject|GLib-CRITICAL|^$"
else
"$_PENTAHO_JAVA" $OPT $STARTUP -lib $LIBPATH "${1+$@}"
fi
fi

0 comments on commit 135bda1

Please sign in to comment.