diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 38b036af1d48..954af15e0077 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -196,6 +196,11 @@ export MAVEN_PROJECTBASEDIR MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" export MAVEN_CMD_LINE_ARGS +# MNG-8248 +if "$JAVACMD" --enable-native-access=ALL-UNNAMED -version >/dev/null 2>&1; then + MAVEN_OPTS="--enable-native-access=ALL-UNNAMED $MAVEN_OPTS" +fi + exec "$JAVACMD" \ $MAVEN_OPTS \ $MAVEN_DEBUG_OPTS \ diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 666656ccd2ae..972c39eaf26c 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -172,6 +172,12 @@ if "_%MAVEN_PROJECTBASEDIR:~-1%"=="_\" set "MAVEN_PROJECTBASEDIR=%MAVEN_PROJECTB for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher +@REM MNG-8248 +"%JAVACMD%" --enable-native-access=ALL-UNNAMED -version >nul 2>&1 +if ERRORLEVEL 1 goto skipEnableNativeAccess +set "MAVEN_OPTS=--enable-native-access=ALL-UNNAMED %MAVEN_OPTS%" +:skipEnableNativeAccess + "%JAVACMD%" ^ %JVM_CONFIG_MAVEN_PROPS% ^ %MAVEN_OPTS% ^