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 4fabaff17821d59f553bfb275594d9010033ba8b Author: Hervé Boutemy <[email protected]> AuthorDate: Sun Oct 10 20:48:37 2021 +0200 [MNG-6914] move common wrapper distributions conf to shared.xml --- apache-maven/src/assembly/wrapper/bin.xml | 48 ++---------------- apache-maven/src/assembly/wrapper/script.xml | 50 ++----------------- .../assembly/wrapper/{script.xml => shared.xml} | 12 ++--- apache-maven/src/assembly/wrapper/source.xml | 58 +++------------------- 4 files changed, 17 insertions(+), 151 deletions(-) diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml index c92a504..608c324 100644 --- a/apache-maven/src/assembly/wrapper/bin.xml +++ b/apache-maven/src/assembly/wrapper/bin.xml @@ -37,49 +37,7 @@ under the License. <outputFileNameMapping>maven-wrapper.jar</outputFileNameMapping> </dependencySet> </dependencySets> - <files> - <file> - <source>src/assembly/shared/mvnwDebug.cmd</source> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - </file> - <file> - <source>src/assembly/shared/mvnwDebug</source> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - </file> - <file> - <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/shared/run.cmd</source> - </sources> - <destName>mvnw.cmd</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - <filtered>true</filtered> - </file> - <file> - <sources> - <source>src/assembly/shared/validate</source> - <source>src/assembly/shared/init</source> - <source>src/assembly/shared/mvnwlauncher</source> - <source>src/assembly/shared/run</source> - </sources> - <destName>mvnw</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - <filtered>true</filtered> - </file> - </files> - <fileSets> - <fileSet> - <directory>src/assembly/wrapper/shared/mvn</directory> - <outputDirectory>.mvn</outputDirectory> - <filtered>true</filtered> - </fileSet> - </fileSets> + <componentDescriptors> + <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor> + </componentDescriptors> </assembly> \ No newline at end of file diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml index 7cc4929..5ccd5f8 100644 --- a/apache-maven/src/assembly/wrapper/script.xml +++ b/apache-maven/src/assembly/wrapper/script.xml @@ -27,51 +27,7 @@ under the License. <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <files> - <file> - <source>src/assembly/shared/mvnwDebug.cmd</source> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - </file> - <file> - <source>src/assembly/shared/mvnwDebug</source> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - </file> - <file> - <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/download.cmd</source> - <source>src/assembly/shared/run.cmd</source> - </sources> - <destName>mvnw.cmd</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - <filtered>true</filtered> - </file> - <file> - <sources> - <source>src/assembly/shared/validate</source> - <source>src/assembly/shared/init</source> - <source>src/assembly/shared/mvnwlauncher</source> - <source>src/assembly/wrapper/shared/download</source> - <source>src/assembly/shared/run</source> - </sources> - <destName>mvnw</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - <filtered>true</filtered> - </file> - </files> - <fileSets> - <fileSet> - <directory>src/assembly/wrapper/shared/mvn</directory> - <outputDirectory>.mvn</outputDirectory> - <filtered>true</filtered> - </fileSet> - </fileSets> + <componentDescriptors> + <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor> + </componentDescriptors> </assembly> \ No newline at end of file diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/shared.xml similarity index 86% copy from apache-maven/src/assembly/wrapper/script.xml copy to apache-maven/src/assembly/wrapper/shared.xml index 7cc4929..f1a3769 100644 --- a/apache-maven/src/assembly/wrapper/script.xml +++ b/apache-maven/src/assembly/wrapper/shared.xml @@ -19,14 +19,8 @@ specific language governing permissions and limitations under the License. --> -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd";> - <id>script</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> +<component xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + 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> @@ -74,4 +68,4 @@ under the License. <filtered>true</filtered> </fileSet> </fileSets> -</assembly> \ No newline at end of file +</component> diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml index b0355c0..1fdc1e2 100644 --- a/apache-maven/src/assembly/wrapper/source.xml +++ b/apache-maven/src/assembly/wrapper/source.xml @@ -27,56 +27,14 @@ under the License. <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <files> - <file> - <source>src/assembly/shared/mvnwDebug.cmd</source> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - </file> - <file> - <source>src/assembly/shared/mvnwDebug</source> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - </file> - <file> - <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/download.cmd</source> - <source>src/assembly/shared/run.cmd</source> - </sources> - <destName>mvnw.cmd</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>dos</lineEnding> - <filtered>true</filtered> - </file> - <file> - <sources> - <source>src/assembly/shared/validate</source> - <source>src/assembly/shared/init</source> - <source>src/assembly/shared/mvnwlauncher</source> - <source>src/assembly/wrapper/shared/download</source> - <source>src/assembly/shared/run</source> - </sources> - <destName>mvnw</destName> - <outputDirectory>.</outputDirectory> - <lineEnding>unix</lineEnding> - <fileMode>0755</fileMode> - <filtered>true</filtered> - </file> - </files> + <componentDescriptors> + <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor> + </componentDescriptors> <fileSets> - <fileSet> - <directory>src/assembly/wrapper/shared/mvn</directory> - <outputDirectory>.mvn</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> - <directory>src/assembly/wrapper/source/mvn</directory> - <outputDirectory>.mvn</outputDirectory> - <filtered>true</filtered> - </fileSet> + <fileSet> + <directory>src/assembly/wrapper/source/mvn</directory> + <outputDirectory>.mvn</outputDirectory> + <filtered>true</filtered> + </fileSet> </fileSets> </assembly>
