This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6914_2 in repository https://gitbox.apache.org/repos/asf/maven.git
commit fd96d7fe1a23d8395bdae0a69e4a30b52cebdd59 Author: Hervé Boutemy <[email protected]> AuthorDate: Sun Oct 10 21:03:32 2021 +0200 [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared --- apache-maven/maven-wrapper.pom | 8 ++++---- apache-maven/pom.xml | 8 ++++---- apache-maven/src/assembly/wrapper/shared.xml | 8 ++++---- apache-maven/src/assembly/{ => wrapper}/shared/mvnwDebug | 0 apache-maven/src/assembly/{ => wrapper}/shared/mvnwDebug.cmd | 0 apache-maven/src/assembly/{ => wrapper}/shared/mvnwlauncher | 0 apache-maven/src/assembly/{ => wrapper}/shared/mvnwlauncher.cmd | 0 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apache-maven/maven-wrapper.pom b/apache-maven/maven-wrapper.pom index 491f0a7..4396529 100644 --- a/apache-maven/maven-wrapper.pom +++ b/apache-maven/maven-wrapper.pom @@ -49,12 +49,12 @@ 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/*/download</exclude> - <exclude>src/assembly/wrapper/*/download.cmd</exclude> + <exclude>src/assembly/wrapper/shared/mvnwlauncher</exclude> + <exclude>src/assembly/wrapper/shared/mvnwlauncher.cmd</exclude> + <exclude>src/assembly/wrapper/shared/download</exclude> + <exclude>src/assembly/wrapper/shared/download.cmd</exclude> </excludes> </configuration> </plugin> diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 40917d5..6436534 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -132,12 +132,12 @@ 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/*/download</exclude> - <exclude>src/assembly/wrapper/*/download.cmd</exclude> + <exclude>src/assembly/wrapper/shared/mvnwlauncher</exclude> + <exclude>src/assembly/wrapper/shared/mvnwlauncher.cmd</exclude> + <exclude>src/assembly/wrapper/shared/download</exclude> + <exclude>src/assembly/wrapper/shared/download.cmd</exclude> </excludes> </configuration> </plugin> diff --git a/apache-maven/src/assembly/wrapper/shared.xml b/apache-maven/src/assembly/wrapper/shared.xml index f1a3769..831c901 100644 --- a/apache-maven/src/assembly/wrapper/shared.xml +++ b/apache-maven/src/assembly/wrapper/shared.xml @@ -23,12 +23,12 @@ under the License. xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0 http://maven.apache.org/xsd/assembly-component-2.1.0.xsd";> <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> @@ -37,7 +37,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/shared/download.cmd</source> <source>src/assembly/shared/run.cmd</source> </sources> @@ -50,7 +50,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/shared/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
