diff --git a/apache-maven/maven-wrapper.pom b/apache-maven/maven-wrapper.pom
index 491f0a7b71..482cddd4cd 100644
--- a/apache-maven/maven-wrapper.pom
+++ b/apache-maven/maven-wrapper.pom
@@ -49,10 +49,10 @@ under the License.
src/assembly/shared/mvnlauncher.cmd
src/assembly/shared/mvnvalidate
src/assembly/shared/mvnvalidate.cmd
- src/assembly/shared/mvnwlauncher
- src/assembly/shared/mvnwlauncher.cmd
src/assembly/shared/run
src/assembly/shared/run.cmd
+ src/assembly/wrapper/shared/mvnwlauncher
+ src/assembly/wrapper/shared/mvnwlauncher.cmd
src/assembly/wrapper/*/download
src/assembly/wrapper/*/download.cmd
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 40917d5343..661071c1f0 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -132,10 +132,10 @@ under the License.
src/assembly/shared/mvnlauncher.cmd
src/assembly/shared/mvnvalidate
src/assembly/shared/mvnvalidate.cmd
- src/assembly/shared/mvnwlauncher
- src/assembly/shared/mvnwlauncher.cmd
src/assembly/shared/run
src/assembly/shared/run.cmd
+ src/assembly/wrapper/shared/mvnwlauncher
+ src/assembly/wrapper/shared/mvnwlauncher.cmd
src/assembly/wrapper/*/download
src/assembly/wrapper/*/download.cmd
diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml
index c92a50474e..7321631438 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven/src/assembly/wrapper/bin.xml
@@ -39,12 +39,12 @@ under the License.
-
+
.
dos
-
+
.
unix
0755
@@ -53,7 +53,7 @@ under the License.
-
+
mvnw.cmd
@@ -65,7 +65,7 @@ under the License.
-
+
mvnw
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index 53c9c783df..8d4d750635 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -29,12 +29,12 @@ under the License.
false
-
+
.
dos
-
+
.
unix
0755
@@ -43,7 +43,7 @@ under the License.
-
+
@@ -56,7 +56,7 @@ under the License.
-
+
diff --git a/apache-maven/src/assembly/shared/mvnwDebug b/apache-maven/src/assembly/wrapper/shared/mvnwDebug
similarity index 100%
rename from apache-maven/src/assembly/shared/mvnwDebug
rename to apache-maven/src/assembly/wrapper/shared/mvnwDebug
diff --git a/apache-maven/src/assembly/shared/mvnwDebug.cmd b/apache-maven/src/assembly/wrapper/shared/mvnwDebug.cmd
similarity index 100%
rename from apache-maven/src/assembly/shared/mvnwDebug.cmd
rename to apache-maven/src/assembly/wrapper/shared/mvnwDebug.cmd
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher b/apache-maven/src/assembly/wrapper/shared/mvnwlauncher
similarity index 100%
rename from apache-maven/src/assembly/shared/mvnwlauncher
rename to apache-maven/src/assembly/wrapper/shared/mvnwlauncher
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher.cmd b/apache-maven/src/assembly/wrapper/shared/mvnwlauncher.cmd
similarity index 100%
rename from apache-maven/src/assembly/shared/mvnwlauncher.cmd
rename to apache-maven/src/assembly/wrapper/shared/mvnwlauncher.cmd
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index 0fb3147b14..29c4564ff8 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -29,12 +29,12 @@ under the License.
false
-
+
.
dos
-
+
.
unix
0755
@@ -43,7 +43,7 @@ under the License.
-
+
@@ -56,7 +56,7 @@ under the License.
-
+