diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
index c1dd12f176..bf82ff01c6 100644
Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 22f219d25e..dc3affce3d 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/maven/bnd-baseline-maven-plugin/pom.xml b/maven/bnd-baseline-maven-plugin/pom.xml
index b2ceb8435e..5f24f09c18 100644
--- a/maven/bnd-baseline-maven-plugin/pom.xml
+++ b/maven/bnd-baseline-maven-plugin/pom.xml
@@ -48,7 +48,7 @@
 			<artifactId>aether-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-export-maven-plugin/pom.xml b/maven/bnd-export-maven-plugin/pom.xml
index a0690a788d..5f854c09d2 100644
--- a/maven/bnd-export-maven-plugin/pom.xml
+++ b/maven/bnd-export-maven-plugin/pom.xml
@@ -42,27 +42,27 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.resolve</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-indexer-maven-plugin/pom.xml b/maven/bnd-indexer-maven-plugin/pom.xml
index e9c8b061d8..b607306ef5 100644
--- a/maven/bnd-indexer-maven-plugin/pom.xml
+++ b/maven/bnd-indexer-maven-plugin/pom.xml
@@ -48,15 +48,15 @@
 			<artifactId>aether-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-maven-plugin/pom.xml b/maven/bnd-maven-plugin/pom.xml
index 39499f82f0..eb50097574 100644
--- a/maven/bnd-maven-plugin/pom.xml
+++ b/maven/bnd-maven-plugin/pom.xml
@@ -56,11 +56,11 @@
 		</dependency>
 
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-plugin-parent/pom.xml b/maven/bnd-plugin-parent/pom.xml
index b4c02e8536..a0a2b5c3e7 100644
--- a/maven/bnd-plugin-parent/pom.xml
+++ b/maven/bnd-plugin-parent/pom.xml
@@ -140,37 +140,37 @@
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.bnd.maven</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.bnd.util</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.bndlib</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.resolve</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.repository</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.bnd.reporter</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/maven/bnd-reporter-maven-plugin/pom.xml b/maven/bnd-reporter-maven-plugin/pom.xml
index a41a58cfc0..83f28563ee 100644
--- a/maven/bnd-reporter-maven-plugin/pom.xml
+++ b/maven/bnd-reporter-maven-plugin/pom.xml
@@ -53,11 +53,11 @@
 		</dependency>
 
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.reporter</artifactId>
 		</dependency>
 
diff --git a/maven/bnd-resolver-maven-plugin/pom.xml b/maven/bnd-resolver-maven-plugin/pom.xml
index d023fdf4ff..d3309831cb 100644
--- a/maven/bnd-resolver-maven-plugin/pom.xml
+++ b/maven/bnd-resolver-maven-plugin/pom.xml
@@ -42,27 +42,27 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.resolve</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/pom.xml b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/pom.xml
index 9cad37f43c..351a6a0f71 100644
--- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/pom.xml
+++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/pom.xml
@@ -20,7 +20,6 @@
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-resolver-maven-plugin</artifactId>
 				<configuration>
-					<bundlesOnly>true</bundlesOnly>
 					<bundles>
 						<bundle>${project.basedir}/bundles/org.apache.felix.eventadmin-1.4.8.jar</bundle>
 						<bundle>${project.basedir}/bundles/org.apache.felix.framework-5.4.0.jar</bundle>
diff --git a/maven/bnd-run-maven-plugin/pom.xml b/maven/bnd-run-maven-plugin/pom.xml
index fb994b593f..0ce3f6f20a 100644
--- a/maven/bnd-run-maven-plugin/pom.xml
+++ b/maven/bnd-run-maven-plugin/pom.xml
@@ -42,27 +42,27 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.resolve</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/maven/bnd-testing-maven-plugin/pom.xml b/maven/bnd-testing-maven-plugin/pom.xml
index 2d42abc199..2e414c2ad3 100644
--- a/maven/bnd-testing-maven-plugin/pom.xml
+++ b/maven/bnd-testing-maven-plugin/pom.xml
@@ -42,27 +42,27 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.maven</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.resolve</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/mvnw b/mvnw
index 5643201c7d..b7f064624f 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Apache Maven Wrapper startup batch script, version 3.1.1
 #
 # Required ENV vars:
 # ------------------
@@ -27,7 +27,6 @@
 #
 # Optional ENV vars
 # -----------------
-#   M2_HOME - location of maven2's installed home dir
 #   MAVEN_OPTS - parameters passed to the Java VM when running Maven
 #     e.g. to debug Maven itself, use
 #       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -62,9 +61,9 @@ case "`uname`" in
     # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
     if [ -z "$JAVA_HOME" ]; then
       if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
+        JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
       else
-        export JAVA_HOME="/Library/Java/Home"
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
       fi
     fi
     ;;
@@ -76,36 +75,8 @@ if [ -z "$JAVA_HOME" ] ; then
   fi
 fi
 
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
@@ -114,8 +85,6 @@ fi
 
 # For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
 fi
@@ -163,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-
   if [ -z "$1" ]
   then
     echo "Path not specified to find_maven_basedir"
@@ -188,7 +154,7 @@ find_maven_basedir() {
     fi
     # end of workaround
   done
-  echo "${basedir}"
+  printf '%s' "$(cd "$basedir"; pwd)"
 }
 
 # concatenates all lines of a file
@@ -198,11 +164,16 @@ concat_lines() {
   fi
 }
 
-BASE_DIR=`find_maven_basedir "$(pwd)"`
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
 if [ -z "$BASE_DIR" ]; then
   exit 1;
 fi
 
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+
 ##########################################################################################
 # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
 # This allows using the maven wrapper in projects that prohibit checking in binary data.
@@ -216,16 +187,16 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
     fi
     while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
       esac
     done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
     if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
+      echo "Downloading from: $wrapperUrl"
     fi
     wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
     if $cygwin; then
@@ -233,42 +204,49 @@ else
     fi
 
     if command -v wget > /dev/null; then
+        QUIET="--quiet"
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found wget ... using wget"
+          QUIET=""
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
         fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
     elif command -v curl > /dev/null; then
+        QUIET="--silent"
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found curl ... using curl"
+          QUIET=""
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
         else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
         fi
-
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"
         fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
         # For Cygwin, switch paths to Windows format before running javac
         if $cygwin; then
+          javaSource=`cygpath --path --windows "$javaSource"`
           javaClass=`cygpath --path --windows "$javaClass"`
         fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
                 if [ "$MVNW_VERBOSE" = true ]; then
                   echo " - Compiling MavenWrapperDownloader.java ..."
                 fi
                 # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
+                ("$JAVA_HOME/bin/javac" "$javaSource")
             fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+            if [ -e "$javaClass" ]; then
                 # Running the downloader
                 if [ "$MVNW_VERBOSE" = true ]; then
                   echo " - Running MavenWrapperDownloader.java ..."
@@ -282,16 +260,10 @@ fi
 # End of extension
 ##########################################################################################
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
@@ -311,6 +283,5 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 23b7079a3d..cba1f040dc 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -18,13 +18,12 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
 @REM
 @REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
 @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@@ -120,10 +119,10 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
 
 FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
 )
 
 @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@@ -134,11 +133,11 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
+        echo Downloading from: %WRAPPER_URL%
     )
 
     powershell -Command "&{"^
@@ -146,7 +145,7 @@ if exist %WRAPPER_JAR% (
 		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
 		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
 		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
 		"}"
     if "%MVNW_VERBOSE%" == "true" (
         echo Finished downloading %WRAPPER_JAR%