Merge pull request #441 from nodeg/update_maven

Author: nodeg

lib/template/bundled/apache-maven-3.9.12/LICENSE

@@ -1,9 +1,3 @@
-Apache Maven Distribution
-Copyright 2001-2024 The Apache Software Foundation
-
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 This software bundles the following NOTICE files from third party library providers:
 
 META-INF/NOTICE in archive lib/guice-5.1.0.jar

…mplate/bundled/apache-maven-3.9.9/NOTICE …plate/bundled/apache-maven-3.9.12/NOTICElib/template/bundled/apache-maven-3.9.9/NOTICE renamed to lib/template/bundled/apache-maven-3.9.12/NOTICE lib/template/bundled/apache-maven-3.9.9/NOTICE renamed to lib/template/bundled/apache-maven-3.9.12/NOTICE

@@ -196,6 +196,15 @@ 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"
+  # MNG-8169
+  if $mingw ; then
+    MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $MAVEN_OPTS"
+  fi
+fi
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \

…te/bundled/apache-maven-3.9.9/README.txt …e/bundled/apache-maven-3.9.12/README.txtlib/template/bundled/apache-maven-3.9.9/README.txt renamed to lib/template/bundled/apache-maven-3.9.12/README.txt lib/template/bundled/apache-maven-3.9.9/README.txt renamed to lib/template/bundled/apache-maven-3.9.12/README.txt

@@ -33,6 +33,10 @@
 @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%"=="on" echo %MAVEN_BATCH_ECHO%
 
+@REM Clear/define a variable for any options to be inserted via script
+@REM We want to avoid trying to parse the external MAVEN_OPTS variable
+SET INTERNAL_MAVEN_OPTS=
+
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%"=="" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
@@ -166,11 +170,21 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 
 :endReadAdditionalConfig
 
+@REM do not let MAVEN_PROJECTBASEDIR end with a single backslash which would escape the double quote. This happens when .mvn at drive root.
+if "_%MAVEN_PROJECTBASEDIR:~-1%"=="_\" set "MAVEN_PROJECTBASEDIR=%MAVEN_PROJECTBASEDIR%\"
+
 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 "INTERNAL_MAVEN_OPTS=--enable-native-access=ALL-UNNAMED %INTERNAL_MAVEN_OPTS%"
+:skipEnableNativeAccess
+
 "%JAVACMD%" ^
   %JVM_CONFIG_MAVEN_PROPS% ^
+  %INTERNAL_MAVEN_OPTS% ^
   %MAVEN_OPTS% ^
   %MAVEN_DEBUG_OPTS% ^
   -classpath %CLASSWORLDS_JAR% ^