Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 43cf16c5d -> e6b62dfa1
Fix NoClassDefFoundError when using Java9 (cherry picked from commit e747742) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e6b62dfa Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e6b62dfa Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e6b62dfa Branch: refs/heads/GROOVY_2_6_X Commit: e6b62dfa1fc5b6471304dfe5244e84f7f6987392 Parents: 43cf16c Author: sunlan <sun...@apache.org> Authored: Fri Sep 22 12:59:58 2017 +0800 Committer: sunlan <sun...@apache.org> Committed: Fri Sep 22 13:00:40 2017 +0800 ---------------------------------------------------------------------- src/bin/startGroovy | 2 ++ src/bin/startGroovy.bat | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e6b62dfa/src/bin/startGroovy ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy b/src/bin/startGroovy index 36d6edd..d727595 100644 --- a/src/bin/startGroovy +++ b/src/bin/startGroovy @@ -220,6 +220,8 @@ if $darwin; then JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GROOVY_APP_NAME -Xdock:icon=$GROOVY_HOME/lib/groovy.icns" fi +JAVA_OPTS="$JAVA_OPTS --add-modules ALL-SYSTEM" + # For Cygwin, switch paths to Windows format before running java if $cygwin ; then GROOVY_HOME=`cygpath --mixed "$GROOVY_HOME"` http://git-wip-us.apache.org/repos/asf/groovy/blob/e6b62dfa/src/bin/startGroovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat index b1e8a3e..f21a763 100644 --- a/src/bin/startGroovy.bat +++ b/src/bin/startGroovy.bat @@ -266,6 +266,8 @@ if not "%TOOLS_JAR%" == "" set GROOVY_OPTS=%GROOVY_OPTS% -Dtools.jar="%TOOLS_JAR set GROOVY_OPTS=%GROOVY_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%" set GROOVY_OPTS=%GROOVY_OPTS% -Dscript.name="%GROOVY_SCRIPT_NAME%" +set JAVA_OPTS=%JAVA_OPTS% --add-modules ALL-SYSTEM + if exist "%USERPROFILE%/.groovy/postinit.bat" call "%USERPROFILE%/.groovy/postinit.bat" @rem Execute Groovy
