From b58d8b3a4ffe2c60feefc35209851b8b2222cdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Sun, 10 Oct 2021 21:03:32 +0200
Subject: [PATCH] [MNG-6914] move mvnw scripts from maven/shared to
 wrapper/shared

---
 apache-maven/maven-wrapper.pom                            | 4 ++--
 apache-maven/pom.xml                                      | 4 ++--
 apache-maven/src/assembly/wrapper/bin.xml                 | 8 ++++----
 apache-maven/src/assembly/wrapper/script.xml              | 8 ++++----
 apache-maven/src/assembly/{ => wrapper}/shared/mvnwDebug  | 0
 .../src/assembly/{ => wrapper}/shared/mvnwDebug.cmd       | 0
 .../src/assembly/{ => wrapper}/shared/mvnwlauncher        | 0
 .../src/assembly/{ => wrapper}/shared/mvnwlauncher.cmd    | 0
 apache-maven/src/assembly/wrapper/source.xml              | 8 ++++----
 9 files changed, 16 insertions(+), 16 deletions(-)
 rename apache-maven/src/assembly/{ => wrapper}/shared/mvnwDebug (100%)
 rename apache-maven/src/assembly/{ => wrapper}/shared/mvnwDebug.cmd (100%)
 rename apache-maven/src/assembly/{ => wrapper}/shared/mvnwlauncher (100%)
 rename apache-maven/src/assembly/{ => wrapper}/shared/mvnwlauncher.cmd (100%)

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.
               <exclude>src/assembly/shared/mvnlauncher.cmd</exclude>
               <exclude>src/assembly/shared/mvnvalidate</exclude>
               <exclude>src/assembly/shared/mvnvalidate.cmd</exclude>
-              <exclude>src/assembly/shared/mvnwlauncher</exclude>
-              <exclude>src/assembly/shared/mvnwlauncher.cmd</exclude>
               <exclude>src/assembly/shared/run</exclude>
               <exclude>src/assembly/shared/run.cmd</exclude>
+              <exclude>src/assembly/wrapper/shared/mvnwlauncher</exclude>
+              <exclude>src/assembly/wrapper/shared/mvnwlauncher.cmd</exclude>
               <exclude>src/assembly/wrapper/*/download</exclude>
               <exclude>src/assembly/wrapper/*/download.cmd</exclude>
             </excludes>
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.
               <exclude>src/assembly/shared/mvnlauncher.cmd</exclude>
               <exclude>src/assembly/shared/mvnvalidate</exclude>
               <exclude>src/assembly/shared/mvnvalidate.cmd</exclude>
-              <exclude>src/assembly/shared/mvnwlauncher</exclude>
-              <exclude>src/assembly/shared/mvnwlauncher.cmd</exclude>
               <exclude>src/assembly/shared/run</exclude>
               <exclude>src/assembly/shared/run.cmd</exclude>
+              <exclude>src/assembly/wrapper/shared/mvnwlauncher</exclude>
+              <exclude>src/assembly/wrapper/shared/mvnwlauncher.cmd</exclude>
               <exclude>src/assembly/wrapper/*/download</exclude>
               <exclude>src/assembly/wrapper/*/download.cmd</exclude>
             </excludes>
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.
   </dependencySets>
   <files>
     <file>
-      <source>src/assembly/shared/mvnwDebug.cmd</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>dos</lineEnding>
     </file>
     <file>
-      <source>src/assembly/shared/mvnwDebug</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>unix</lineEnding>
       <fileMode>0755</fileMode>
@@ -53,7 +53,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate.cmd</source>
         <source>src/assembly/shared/init.cmd</source>
-        <source>src/assembly/shared/mvnwlauncher.cmd</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher.cmd</source>
         <source>src/assembly/shared/run.cmd</source>
       </sources>
       <destName>mvnw.cmd</destName>
@@ -65,7 +65,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate</source>
         <source>src/assembly/shared/init</source>
-        <source>src/assembly/shared/mvnwlauncher</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher</source>
         <source>src/assembly/shared/run</source>
       </sources>
       <destName>mvnw</destName>
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.
   <includeBaseDirectory>false</includeBaseDirectory>
   <files>
     <file>
-      <source>src/assembly/shared/mvnwDebug.cmd</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>dos</lineEnding>
     </file>
     <file>
-      <source>src/assembly/shared/mvnwDebug</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>unix</lineEnding>
       <fileMode>0755</fileMode>
@@ -43,7 +43,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate.cmd</source>
         <source>src/assembly/shared/init.cmd</source>
-        <source>src/assembly/shared/mvnwlauncher.cmd</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher.cmd</source>
         <source>src/assembly/wrapper/script/download.cmd</source>
         <source>src/assembly/shared/run.cmd</source>
       </sources>
@@ -56,7 +56,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate</source>
         <source>src/assembly/shared/init</source>
-        <source>src/assembly/shared/mvnwlauncher</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher</source>
         <source>src/assembly/wrapper/script/download</source>
         <source>src/assembly/shared/run</source>
       </sources>
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.
   <includeBaseDirectory>false</includeBaseDirectory>
   <files>
     <file>
-      <source>src/assembly/shared/mvnwDebug.cmd</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>dos</lineEnding>
     </file>
     <file>
-      <source>src/assembly/shared/mvnwDebug</source>
+      <source>src/assembly/wrapper/shared/mvnwDebug</source>
       <outputDirectory>.</outputDirectory>
       <lineEnding>unix</lineEnding>
       <fileMode>0755</fileMode>
@@ -43,7 +43,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate.cmd</source>
         <source>src/assembly/shared/init.cmd</source>
-        <source>src/assembly/shared/mvnwlauncher.cmd</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher.cmd</source>
         <source>src/assembly/wrapper/source/download.cmd</source>
         <source>src/assembly/shared/run.cmd</source>
       </sources>
@@ -56,7 +56,7 @@ under the License.
       <sources>
         <source>src/assembly/shared/validate</source>
         <source>src/assembly/shared/init</source>
-        <source>src/assembly/shared/mvnwlauncher</source>
+        <source>src/assembly/wrapper/shared/mvnwlauncher</source>
         <source>src/assembly/wrapper/source/download</source>
         <source>src/assembly/shared/run</source>
       </sources>