You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/10/10 18:48:45 UTC
[maven] branch MNG-6914_2 created (now c66d2cf)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git.
at c66d2cf [MNG-6914] move common wrapper distributions conf to shared.xml
This branch includes the following new commits:
new b304c0c [MNG-6914] rename .mvn hidden directory in source to mvn
new 3a6b79c [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
new 0dacb2f [MNG-6914] drop tar.gz archives for wrapper install distributions
new 9f33b07 [MNG-6914] move download script to wrapper/shared
new c66d2cf [MNG-6914] move common wrapper distributions conf to shared.xml
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 02/05: [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS
(from LAUNCHER_JAR)
Posted by hb...@apache.org.
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 3a6b79c3f9ec31940b6e44138d0e12457c5fd195
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:07:36 2021 +0200
[MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
---
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/mvnwlauncher | 2 +-
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/run | 2 +-
apache-maven/src/assembly/shared/run.cmd | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apache-maven/src/assembly/shared/mvnlauncher b/apache-maven/src/assembly/shared/mvnlauncher
index c523a1d..830f067 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -1,3 +1,3 @@
LAUNCHER_JAR=`echo "$MAVEN_HOME"/boot/plexus-classworlds-*.jar`
-MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
diff --git a/apache-maven/src/assembly/shared/mvnlauncher.cmd b/apache-maven/src/assembly/shared/mvnlauncher.cmd
index be2f9a9..567e812 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnlauncher.cmd
@@ -1,3 +1,3 @@
for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
-set MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+set LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher b/apache-maven/src/assembly/shared/mvnwlauncher
index 39ba322..3fbd254 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher
+++ b/apache-maven/src/assembly/shared/mvnwlauncher
@@ -1,3 +1,3 @@
LAUNCHER_JAR="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+LAUNCHER_CLASS=org.apache.maven.wrapper.MavenWrapperMain
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher.cmd b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
index 46cad98..193db12 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
@@ -1,3 +1,3 @@
set LAUNCHER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+set LAUNCHER_CLASS=org.apache.maven.wrapper.MavenWrapperMain
diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
index 0b2c1bd..b35bafc 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -16,4 +16,4 @@ exec "$JAVACMD" \
"-Dmaven.home=$MAVEN_HOME" \
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
"-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
- $MAVEN_LAUNCHER "$@"
+ $AUNCHER_CLASS "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
index 04c1dff..ac526f8 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -7,7 +7,7 @@
"-Dmaven.home=%MAVEN_HOME%" ^
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
- %MAVEN_LAUNCHER% %*
+ %LAUNCHER_CLASS% %*
if ERRORLEVEL 1 goto error
goto end
[maven] 03/05: [MNG-6914] drop tar.gz archives for wrapper install
distributions
Posted by hb...@apache.org.
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 0dacb2f9f1004c6517f8fc809d0c094640d0ca0b
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:19:22 2021 +0200
[MNG-6914] drop tar.gz archives for wrapper install distributions
---
apache-maven/src/assembly/wrapper/bin.xml | 1 -
apache-maven/src/assembly/wrapper/script.xml | 1 -
apache-maven/src/assembly/wrapper/source.xml | 1 -
3 files changed, 3 deletions(-)
diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml
index a8b63db..c92a504 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven/src/assembly/wrapper/bin.xml
@@ -24,7 +24,6 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>bin</id>
<formats>
- <format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index 0edba13..53c9c78 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -24,7 +24,6 @@ under the License.
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>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index 3d4e138..0fb3147 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -24,7 +24,6 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>source</id>
<formats>
- <format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
[maven] 04/05: [MNG-6914] move download script to wrapper/shared
Posted by hb...@apache.org.
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 9f33b07874ce0d553d69536f12fd581888d73c3e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:36:17 2021 +0200
[MNG-6914] move download script to wrapper/shared
---
apache-maven/src/assembly/wrapper/script.xml | 4 +--
.../assembly/wrapper/{script => shared}/download | 0
.../wrapper/{script => shared}/download.cmd | 0
apache-maven/src/assembly/wrapper/source.xml | 4 +--
apache-maven/src/assembly/wrapper/source/download | 34 ----------------------
.../src/assembly/wrapper/source/download.cmd | 21 -------------
6 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index 53c9c78..7cc4929 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -44,7 +44,7 @@ under the License.
<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/script/download.cmd</source>
+ <source>src/assembly/wrapper/shared/download.cmd</source>
<source>src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
@@ -57,7 +57,7 @@ under the License.
<source>src/assembly/shared/validate</source>
<source>src/assembly/shared/init</source>
<source>src/assembly/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/script/download</source>
+ <source>src/assembly/wrapper/shared/download</source>
<source>src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
diff --git a/apache-maven/src/assembly/wrapper/script/download b/apache-maven/src/assembly/wrapper/shared/download
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download
rename to apache-maven/src/assembly/wrapper/shared/download
diff --git a/apache-maven/src/assembly/wrapper/script/download.cmd b/apache-maven/src/assembly/wrapper/shared/download.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download.cmd
rename to apache-maven/src/assembly/wrapper/shared/download.cmd
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index 0fb3147..b0355c0 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -44,7 +44,7 @@ under the License.
<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/source/download.cmd</source>
+ <source>src/assembly/wrapper/shared/download.cmd</source>
<source>src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
@@ -57,7 +57,7 @@ under the License.
<source>src/assembly/shared/validate</source>
<source>src/assembly/shared/init</source>
<source>src/assembly/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/source/download</source>
+ <source>src/assembly/wrapper/shared/download</source>
<source>src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
diff --git a/apache-maven/src/assembly/wrapper/source/download b/apache-maven/src/assembly/wrapper/source/download
deleted file mode 100644
index 30cf5e4..0000000
--- a/apache-maven/src/assembly/wrapper/source/download
+++ /dev/null
@@ -1,34 +0,0 @@
-##########################################################################################
-# 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.
-##########################################################################################
-if [ -r "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
-else
- javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
diff --git a/apache-maven/src/assembly/wrapper/source/download.cmd b/apache-maven/src/assembly/wrapper/source/download.cmd
deleted file mode 100644
index 40d8451..0000000
--- a/apache-maven/src/assembly/wrapper/source/download.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-
-SET javaClass="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenWrapperDownloader.java"
-IF EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenDownloader.class" goto :runDownloader
-
-if "%MVNW_VERBOSE%" == "true" echo - Compiling MavenWrapperDownloader.java ...
-
-@REM Compiling the Java class
-"%JAVA_HOME%\bin\javac" %javaClass%
-
-:runDownloader
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenWrapperDownloader.class" goto endWrapper
-
-if "%MVNW_VERBOSE%" == "true" echo - Running MavenWrapperDownloader.class ...
-@REM Running the downloader
-"%JAVA_HOME%\bin\java" -cp "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper" MavenWrapperDownloader "%MAVEN_PROJECTBASEDIR%"
-
-:endWrapper
-@REM End of extension
-
[maven] 01/05: [MNG-6914] rename .mvn hidden directory in source to
mvn
Posted by hb...@apache.org.
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 b304c0c6139eeddcc2f0f8768ccc155d91605ab9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:04:58 2021 +0200
[MNG-6914] rename .mvn hidden directory in source to mvn
---
apache-maven/src/assembly/wrapper/bin.xml | 7 ++-----
apache-maven/src/assembly/wrapper/script.xml | 7 ++-----
.../shared/{.mvn => mvn}/wrapper/maven-wrapper.properties | 0
apache-maven/src/assembly/wrapper/source.xml | 14 ++++----------
.../{.mvn => mvn}/wrapper/MavenWrapperDownloader.java | 0
5 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven/src/assembly/wrapper/bin.xml
index d6f5281..a8b63db 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven/src/assembly/wrapper/bin.xml
@@ -78,11 +78,8 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>.mvn/**</include>
- </includes>
+ <directory>src/assembly/wrapper/shared/mvn</directory>
+ <outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index b01eece..0edba13 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -70,11 +70,8 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>.mvn/**</include>
- </includes>
+ <directory>src/assembly/wrapper/shared/mvn</directory>
+ <outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
diff --git a/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties b/apache-maven/src/assembly/wrapper/shared/mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties
rename to apache-maven/src/assembly/wrapper/shared/mvn/wrapper/maven-wrapper.properties
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index f3e79c0..3d4e138 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -70,19 +70,13 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>.mvn/**</include>
- </includes>
+ <directory>src/assembly/wrapper/shared/mvn</directory>
+ <outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/assembly/wrapper/source</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>.mvn/**</include>
- </includes>
+ <directory>src/assembly/wrapper/source/mvn</directory>
+ <outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
diff --git a/apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java b/apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java
rename to apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java
[maven] 05/05: [MNG-6914] move common wrapper distributions conf to
shared.xml
Posted by hb...@apache.org.
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 c66d2cf6c55c671b88e0d75a6ca28ebd51f63468
Author: Hervé Boutemy <hb...@apache.org>
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 | 55 ++--------------------
4 files changed, 12 insertions(+), 153 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..c790dde 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -27,56 +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>
- <fileSet>
- <directory>src/assembly/wrapper/source/mvn</directory>
- <outputDirectory>.mvn</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
+ <componentDescriptors>
+ <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>