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/16 17:44:43 UTC
[maven] branch master updated (4c21e11 -> 2f81b7d)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 4c21e11 [MNG-7298] - Avoid redundant conditions.
new bb0fed9 [MNG-6914] rename .mvn hidden directory in source to mvn
new bf59026 [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
new 5be4192 [MNG-6914] drop tar.gz archives for wrapper install distributions
new b58d8b3 [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared
new ede86ab [MNG-6914] move apache-maven-wrapper to its own separate Maven module
new 2f81b7d [MNG-6914] move assembly descriptors to src/assembly
The 6 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.
Summary of changes:
.github/workflows/maven.yml | 15 +++++-
Jenkinsfile | 6 ++-
Jenkinsfile.its | 2 +-
.../pom.xml | 27 +++-------
.../src/assembly}/bin.xml | 22 ++++----
.../src/assembly}/script.xml | 26 ++++------
.../src/assembly}/script/download | 0
.../src/assembly}/script/download.cmd | 0
.../shared/mvn}/wrapper/maven-wrapper.properties | 0
.../src/assembly/shared/mvnwDebug | 0
.../src/assembly/shared/mvnwDebug.cmd | 0
.../src/assembly/shared/mvnwlauncher | 2 +-
.../src/assembly/shared/mvnwlauncher.cmd | 2 +-
.../src/assembly}/source.xml | 31 +++++-------
.../src/assembly}/source/download | 0
.../src/assembly}/source/download.cmd | 0
.../mvn}/wrapper/MavenWrapperDownloader.java | 0
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 ++++++++++++++++++++++
.../src/site/site.xml | 0
apache-maven/pom.xml | 12 ++---
apache-maven/src/assembly/{maven => }/bin.xml | 2 +-
.../src/assembly/{maven => }/component.xml | 0
apache-maven/src/assembly/{maven => }/dir.xml | 2 +-
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/run | 2 +-
apache-maven/src/assembly/shared/run.cmd | 2 +-
apache-maven/src/assembly/{maven => }/src.xml | 0
maven-wrapper/src/site/apt/index.apt | 4 +-
pom.xml | 2 +-
src/site/xdoc/index.xml | 2 +-
31 files changed, 135 insertions(+), 88 deletions(-)
rename apache-maven/maven-wrapper.pom => apache-maven-wrapper/pom.xml (74%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/bin.xml (82%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script.xml (76%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download (100%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/shared/.mvn => apache-maven-wrapper/src/assembly/shared/mvn}/wrapper/maven-wrapper.properties (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug.cmd (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher (54%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher.cmd (54%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source.xml (73%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download (100%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/source/.mvn => apache-maven-wrapper/src/assembly/source/mvn}/wrapper/MavenWrapperDownloader.java (100%)
create mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
copy {apache-maven => apache-maven-wrapper}/src/site/site.xml (100%)
rename apache-maven/src/assembly/{maven => }/bin.xml (93%)
rename apache-maven/src/assembly/{maven => }/component.xml (100%)
rename apache-maven/src/assembly/{maven => }/dir.xml (93%)
rename apache-maven/src/assembly/{maven => }/src.xml (100%)
[maven] 04/06: [MNG-6914] move mvnw scripts from maven/shared 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 master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit b58d8b3a4ffe2c60feefc35209851b8b2222cdb1
Author: Hervé Boutemy <hb...@apache.org>
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 | 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
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
apache-maven/src/assembly/wrapper/source.xml | 8 ++++----
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/apache-maven/maven-wrapper.pom b/apache-maven/maven-wrapper.pom
index 491f0a7..482cddd 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 40917d5..661071c 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 c92a504..7321631 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 53c9c78..8d4d750 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 0fb3147..29c4564 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>
[maven] 06/06: [MNG-6914] move assembly descriptors to src/assembly
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2f81b7d93be9e6278f1efa46f43055f548004867
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 23:39:21 2021 +0200
[MNG-6914] move assembly descriptors to src/assembly
---
apache-maven/pom.xml | 6 +++---
apache-maven/src/assembly/{maven => }/bin.xml | 2 +-
apache-maven/src/assembly/{maven => }/component.xml | 0
apache-maven/src/assembly/{maven => }/dir.xml | 2 +-
apache-maven/src/assembly/{maven => }/src.xml | 0
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 40cfb25..57f2718 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -200,7 +200,7 @@ under the License.
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/maven/bin.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -268,7 +268,7 @@ under the License.
<attach>false</attach>
<outputDirectory>${distributionTargetDir}</outputDirectory>
<descriptors>
- <descriptor>src/assembly/maven/dir.xml</descriptor>
+ <descriptor>src/assembly/dir.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -292,7 +292,7 @@ under the License.
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/maven/src.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
diff --git a/apache-maven/src/assembly/maven/bin.xml b/apache-maven/src/assembly/bin.xml
similarity index 93%
rename from apache-maven/src/assembly/maven/bin.xml
rename to apache-maven/src/assembly/bin.xml
index 3addb34..2ecbf30 100644
--- a/apache-maven/src/assembly/maven/bin.xml
+++ b/apache-maven/src/assembly/bin.xml
@@ -25,6 +25,6 @@ under the License.
<format>tar.gz</format>
</formats>
<componentDescriptors>
- <componentDescriptor>src/assembly/maven/component.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/apache-maven/src/assembly/maven/component.xml b/apache-maven/src/assembly/component.xml
similarity index 100%
rename from apache-maven/src/assembly/maven/component.xml
rename to apache-maven/src/assembly/component.xml
diff --git a/apache-maven/src/assembly/maven/dir.xml b/apache-maven/src/assembly/dir.xml
similarity index 93%
rename from apache-maven/src/assembly/maven/dir.xml
rename to apache-maven/src/assembly/dir.xml
index 418327d..76adb87 100644
--- a/apache-maven/src/assembly/maven/dir.xml
+++ b/apache-maven/src/assembly/dir.xml
@@ -25,6 +25,6 @@ under the License.
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/assembly/maven/component.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
diff --git a/apache-maven/src/assembly/maven/src.xml b/apache-maven/src/assembly/src.xml
similarity index 100%
rename from apache-maven/src/assembly/maven/src.xml
rename to apache-maven/src/assembly/src.xml
[maven] 02/06: [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 master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit bf59026554f954296bbedaa21359afc0a9c3e4b2
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..69535d6 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 "$@"
+ $LAUNCHER_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/06: [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 master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5be4192ded0e9b6e7ff462da031a8f92e943396f
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] 01/06: [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 master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit bb0fed9f40d16303c51ff050b64270da80d391b4
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/06: [MNG-6914] move apache-maven-wrapper to its own
separate Maven module
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ede86ab4b6711b2f2971220f05c60bcf2f59655e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 23:35:06 2021 +0200
[MNG-6914] move apache-maven-wrapper to its own separate Maven module
---
.github/workflows/maven.yml | 15 +++++-
Jenkinsfile | 6 ++-
Jenkinsfile.its | 2 +-
.../pom.xml | 31 ++++--------
.../src/assembly}/bin.xml | 24 ++++-----
.../src/assembly}/script.xml | 28 +++++------
.../src/assembly}/script/download | 0
.../src/assembly}/script/download.cmd | 0
.../shared/mvn/wrapper/maven-wrapper.properties | 0
.../src/assembly}/shared/mvnwDebug | 0
.../src/assembly}/shared/mvnwDebug.cmd | 0
.../src/assembly}/shared/mvnwlauncher | 0
.../src/assembly}/shared/mvnwlauncher.cmd | 0
.../src/assembly}/source.xml | 28 +++++------
.../src/assembly}/source/download | 0
.../src/assembly}/source/download.cmd | 0
.../source/mvn/wrapper/MavenWrapperDownloader.java | 0
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 ++++++++++++++++++++++
apache-maven-wrapper/src/site/site.xml | 31 ++++++++++++
apache-maven/pom.xml | 6 +--
maven-wrapper/src/site/apt/index.apt | 4 +-
pom.xml | 2 +-
src/site/xdoc/index.xml | 2 +-
23 files changed, 165 insertions(+), 72 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 733d929..addba89 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -46,6 +46,13 @@ jobs:
name: built-maven
path: apache-maven/target/
+ - name: Upload built Apache Maven Wrapper
+ uses: actions/upload-artifact@v2
+ if: ${{ matrix.os == 'ubuntu-latest' }}
+ with:
+ name: built-apache-maven-wrapper
+ path: apache-maven-wrapper/target/
+
- name: Upload built Maven Wrapper
uses: actions/upload-artifact@v2
if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -116,6 +123,12 @@ jobs:
name: built-maven
path: built-maven/
+ - name: Download built Apache Maven Wrapper
+ uses: actions/download-artifact@v2
+ with:
+ name: built-apache-maven-wrapper
+ path: built-apache-maven-wrapper/
+
- name: Download built Maven Wrapper
uses: actions/download-artifact@v2
with:
@@ -131,4 +144,4 @@ jobs:
- name: Running integration tests
shell: bash
- run: mvn install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -DwrapperDistroDir="$GITHUB_WORKSPACE/built-maven/" -DmavenWrapper="$GITHUB_WORKSPACE/built-maven-wrapper/maven-wrapper.jar" -f maven-integration-testing/pom.xml
+ run: mvn install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -DwrapperDistroDir="$GITHUB_WORKSPACE/built-apache-maven-wrapper/" -DmavenWrapper="$GITHUB_WORKSPACE/built-maven-wrapper/maven-wrapper.jar" -f maven-integration-testing/pom.xml
diff --git a/Jenkinsfile b/Jenkinsfile
index 54b8652..15947ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,10 @@ node(jenkinsEnv.nodeSelection(osNode)) {
sh "mvn ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore=true -P versionlessMavenDist"
}
dir ('apache-maven/target') {
- stash includes: 'apache-maven-bin.zip,apache-maven-wrapper-*.zip', name: 'maven-dist'
+ stash includes: 'apache-maven-bin.zip', name: 'maven-dist'
+ }
+ dir ('apache-maven-wrapper/target') {
+ stash includes: 'apache-maven-wrapper-*.zip', name: 'maven-wrapper-dist'
}
dir ('maven-wrapper/target') {
stash includes: 'maven-wrapper.jar', name: 'wrapper-dist'
@@ -102,6 +105,7 @@ for (String os in runITsOses) {
}
dir('dists') {
unstash 'maven-dist'
+ unstash 'maven-wrapper-dist'
unstash 'wrapper-dist'
}
try {
diff --git a/Jenkinsfile.its b/Jenkinsfile.its
index 5df3e2c..8258613 100644
--- a/Jenkinsfile.its
+++ b/Jenkinsfile.its
@@ -41,7 +41,7 @@ pipeline {
git url: "https://github.com/apache/maven-integration-testing.git", branch: "${ITS_BRANCH}"
sh "ls -lrt ${env.WORKSPACE}/apache-maven/target/"
withEnv(["JAVA_HOME=${ tool "JDK 1.8 (latest)" }", "PATH+MAVEN=${tool 'Maven 3.6.3'}/bin:${env.JAVA_HOME}/bin"]) {
- sh "mvn clean install -V -B -Prun-its,embedded -Dmaven.test.failure.ignore=true -Dmaven.repo.local=${env.WORKSPACE}/repo -DmavenDistro=${env.WORKSPACE}/apache-maven/target/apache-maven-bin.zip -DwrapperDistroDir=${env.WORKSPACE}/apache-maven/target -DmavenWrapper=${env.WORKSPACE}/maven-wrapper/target/maven-wrapper.jar"
+ sh "mvn clean install -V -B -Prun-its,embedded -Dmaven.test.failure.ignore=true -Dmaven.repo.local=${env.WORKSPACE}/repo -DmavenDistro=${env.WORKSPACE}/apache-maven/target/apache-maven-bin.zip -DwrapperDistroDir=${env.WORKSPACE}/apache-maven-wrapper/target -DmavenWrapper=${env.WORKSPACE}/maven-wrapper/target/maven-wrapper.jar"
}
}
}
diff --git a/apache-maven/maven-wrapper.pom b/apache-maven-wrapper/pom.xml
similarity index 71%
rename from apache-maven/maven-wrapper.pom
rename to apache-maven-wrapper/pom.xml
index 482cddd..eec5c7c 100644
--- a/apache-maven/maven-wrapper.pom
+++ b/apache-maven-wrapper/pom.xml
@@ -31,7 +31,7 @@ under the License.
<packaging>pom</packaging>
<name>Apache Maven Wrapper Distribution</name>
- <description>The Apache Maven Wrapper distribution in zip and tar.gz formats.</description>
+ <description>The Apache Maven Wrapper distribution zips in 3 types: script, bin and source.</description>
<build>
<pluginManagement>
@@ -42,19 +42,11 @@ under the License.
<configuration>
<excludes combine.children="append">
<exclude>src/assembly/maven/bin/m2.conf</exclude>
- <!-- these are partial scripts, resulting in mvn/mwnw scripts -->
- <exclude>src/assembly/shared/init</exclude>
- <exclude>src/assembly/shared/init.cmd</exclude>
- <exclude>src/assembly/shared/mvnlauncher</exclude>
- <exclude>src/assembly/shared/mvnlauncher.cmd</exclude>
- <exclude>src/assembly/shared/mvnvalidate</exclude>
- <exclude>src/assembly/shared/mvnvalidate.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>
+ <!-- these are partial scripts, resulting in mwnw scripts -->
+ <exclude>src/assembly/shared/mvnwlauncher</exclude>
+ <exclude>src/assembly/shared/mvnwlauncher.cmd</exclude>
+ <exclude>src/assembly/*/download</exclude>
+ <exclude>src/assembly/*/download.cmd</exclude>
</excludes>
</configuration>
</plugin>
@@ -81,9 +73,9 @@ under the License.
</executions>
<configuration>
<descriptors>
- <descriptor>src/assembly/wrapper/script.xml</descriptor>
- <descriptor>src/assembly/wrapper/bin.xml</descriptor>
- <descriptor>src/assembly/wrapper/source.xml</descriptor>
+ <descriptor>src/assembly/script.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -103,7 +95,7 @@ under the License.
<id>apache-release</id>
<build>
<plugins>
- <!-- calculate checksums of source release for Apache dist area -->
+ <!-- calculate sha512 checksums -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
@@ -121,11 +113,8 @@ under the License.
<directory>${project.build.directory}</directory>
<includes>
<include>${project.artifactId}-${project.version}-bin.zip</include>
- <include>${project.artifactId}-${project.version}-bin.tar.gz</include>
<include>${project.artifactId}-${project.version}-script.zip</include>
- <include>${project.artifactId}-${project.version}-script.tar.gz</include>
<include>${project.artifactId}-${project.version}-source.zip</include>
- <include>${project.artifactId}-${project.version}-source.tar.gz</include>
</includes>
</fileSet>
</fileSets>
diff --git a/apache-maven/src/assembly/wrapper/bin.xml b/apache-maven-wrapper/src/assembly/bin.xml
similarity index 76%
rename from apache-maven/src/assembly/wrapper/bin.xml
rename to apache-maven-wrapper/src/assembly/bin.xml
index 7321631..76cdc18 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven-wrapper/src/assembly/bin.xml
@@ -39,22 +39,22 @@ under the License.
</dependencySets>
<files>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
+ <source>src/assembly/shared/mvnwDebug.cmd</source>
<outputDirectory>.</outputDirectory>
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug</source>
+ <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/wrapper/shared/mvnwlauncher.cmd</source>
- <source>src/assembly/shared/run.cmd</source>
+ <source>../apache-maven/src/assembly/shared/validate.cmd</source>
+ <source>../apache-maven/src/assembly/shared/init.cmd</source>
+ <source>src/assembly/shared/mvnwlauncher.cmd</source>
+ <source>../apache-maven/src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
<outputDirectory>.</outputDirectory>
@@ -63,10 +63,10 @@ under the License.
</file>
<file>
<sources>
- <source>src/assembly/shared/validate</source>
- <source>src/assembly/shared/init</source>
- <source>src/assembly/wrapper/shared/mvnwlauncher</source>
- <source>src/assembly/shared/run</source>
+ <source>../apache-maven/src/assembly/shared/validate</source>
+ <source>../apache-maven/src/assembly/shared/init</source>
+ <source>src/assembly/shared/mvnwlauncher</source>
+ <source>../apache-maven/src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
<outputDirectory>.</outputDirectory>
@@ -77,9 +77,9 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared/mvn</directory>
+ <directory>src/assembly/shared/mvn</directory>
<outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven-wrapper/src/assembly/script.xml
similarity index 70%
rename from apache-maven/src/assembly/wrapper/script.xml
rename to apache-maven-wrapper/src/assembly/script.xml
index 8d4d750..8f5406e 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven-wrapper/src/assembly/script.xml
@@ -29,23 +29,23 @@ under the License.
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
+ <source>src/assembly/shared/mvnwDebug.cmd</source>
<outputDirectory>.</outputDirectory>
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug</source>
+ <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/wrapper/shared/mvnwlauncher.cmd</source>
- <source>src/assembly/wrapper/script/download.cmd</source>
- <source>src/assembly/shared/run.cmd</source>
+ <source>../apache-maven/src/assembly/shared/validate.cmd</source>
+ <source>../apache-maven/src/assembly/shared/init.cmd</source>
+ <source>src/assembly/shared/mvnwlauncher.cmd</source>
+ <source>src/assembly/script/download.cmd</source>
+ <source>../apache-maven/src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
<outputDirectory>.</outputDirectory>
@@ -54,11 +54,11 @@ under the License.
</file>
<file>
<sources>
- <source>src/assembly/shared/validate</source>
- <source>src/assembly/shared/init</source>
- <source>src/assembly/wrapper/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/script/download</source>
- <source>src/assembly/shared/run</source>
+ <source>../apache-maven/src/assembly/shared/validate</source>
+ <source>../apache-maven/src/assembly/shared/init</source>
+ <source>src/assembly/shared/mvnwlauncher</source>
+ <source>src/assembly/script/download</source>
+ <source>../apache-maven/src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
<outputDirectory>.</outputDirectory>
@@ -69,9 +69,9 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared/mvn</directory>
+ <directory>src/assembly/shared/mvn</directory>
<outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/apache-maven/src/assembly/wrapper/script/download b/apache-maven-wrapper/src/assembly/script/download
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download
rename to apache-maven-wrapper/src/assembly/script/download
diff --git a/apache-maven/src/assembly/wrapper/script/download.cmd b/apache-maven-wrapper/src/assembly/script/download.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download.cmd
rename to apache-maven-wrapper/src/assembly/script/download.cmd
diff --git a/apache-maven/src/assembly/wrapper/shared/mvn/wrapper/maven-wrapper.properties b/apache-maven-wrapper/src/assembly/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-wrapper/src/assembly/shared/mvn/wrapper/maven-wrapper.properties
diff --git a/apache-maven/src/assembly/wrapper/shared/mvnwDebug b/apache-maven-wrapper/src/assembly/shared/mvnwDebug
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/mvnwDebug
rename to apache-maven-wrapper/src/assembly/shared/mvnwDebug
diff --git a/apache-maven/src/assembly/wrapper/shared/mvnwDebug.cmd b/apache-maven-wrapper/src/assembly/shared/mvnwDebug.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/mvnwDebug.cmd
rename to apache-maven-wrapper/src/assembly/shared/mvnwDebug.cmd
diff --git a/apache-maven/src/assembly/wrapper/shared/mvnwlauncher b/apache-maven-wrapper/src/assembly/shared/mvnwlauncher
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/mvnwlauncher
rename to apache-maven-wrapper/src/assembly/shared/mvnwlauncher
diff --git a/apache-maven/src/assembly/wrapper/shared/mvnwlauncher.cmd b/apache-maven-wrapper/src/assembly/shared/mvnwlauncher.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/mvnwlauncher.cmd
rename to apache-maven-wrapper/src/assembly/shared/mvnwlauncher.cmd
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven-wrapper/src/assembly/source.xml
similarity index 71%
rename from apache-maven/src/assembly/wrapper/source.xml
rename to apache-maven-wrapper/src/assembly/source.xml
index 29c4564..1e7e667 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven-wrapper/src/assembly/source.xml
@@ -29,23 +29,23 @@ under the License.
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug.cmd</source>
+ <source>src/assembly/shared/mvnwDebug.cmd</source>
<outputDirectory>.</outputDirectory>
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>src/assembly/wrapper/shared/mvnwDebug</source>
+ <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/wrapper/shared/mvnwlauncher.cmd</source>
- <source>src/assembly/wrapper/source/download.cmd</source>
- <source>src/assembly/shared/run.cmd</source>
+ <source>../apache-maven/src/assembly/shared/validate.cmd</source>
+ <source>../apache-maven/src/assembly/shared/init.cmd</source>
+ <source>src/assembly/shared/mvnwlauncher.cmd</source>
+ <source>src/assembly/source/download.cmd</source>
+ <source>../apache-maven/src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
<outputDirectory>.</outputDirectory>
@@ -54,11 +54,11 @@ under the License.
</file>
<file>
<sources>
- <source>src/assembly/shared/validate</source>
- <source>src/assembly/shared/init</source>
- <source>src/assembly/wrapper/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/source/download</source>
- <source>src/assembly/shared/run</source>
+ <source>../apache-maven/src/assembly/shared/validate</source>
+ <source>../apache-maven/src/assembly/shared/init</source>
+ <source>src/assembly/shared/mvnwlauncher</source>
+ <source>src/assembly/source/download</source>
+ <source>../apache-maven/src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
<outputDirectory>.</outputDirectory>
@@ -69,12 +69,12 @@ under the License.
</files>
<fileSets>
<fileSet>
- <directory>src/assembly/wrapper/shared/mvn</directory>
+ <directory>src/assembly/shared/mvn</directory>
<outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/assembly/wrapper/source/mvn</directory>
+ <directory>src/assembly/source/mvn</directory>
<outputDirectory>.mvn</outputDirectory>
<filtered>true</filtered>
</fileSet>
diff --git a/apache-maven/src/assembly/wrapper/source/download b/apache-maven-wrapper/src/assembly/source/download
similarity index 100%
rename from apache-maven/src/assembly/wrapper/source/download
rename to apache-maven-wrapper/src/assembly/source/download
diff --git a/apache-maven/src/assembly/wrapper/source/download.cmd b/apache-maven-wrapper/src/assembly/source/download.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/source/download.cmd
rename to apache-maven-wrapper/src/assembly/source/download.cmd
diff --git a/apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java b/apache-maven-wrapper/src/assembly/source/mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from apache-maven/src/assembly/wrapper/source/mvn/wrapper/MavenWrapperDownloader.java
rename to apache-maven-wrapper/src/assembly/source/mvn/wrapper/MavenWrapperDownloader.java
diff --git a/apache-maven-wrapper/src/site/apt/index.apt.vm b/apache-maven-wrapper/src/site/apt/index.apt.vm
new file mode 100644
index 0000000..a8ecdc9
--- /dev/null
+++ b/apache-maven-wrapper/src/site/apt/index.apt.vm
@@ -0,0 +1,58 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+ -----
+ ${project.name}
+ -----
+ Hervé Boutemy
+ -----
+ 2021-10-10
+ -----
+
+${project.name}
+
+ ${project.description}
+
+ Distributions types share the same base structure:
+
+----
+mvnw
+mvnw.cmd
+mvnwDebug
+mvnwDebug.cmd
+.mvn/wrapper/maven-wrapper.properties
+----
+
+ but every distribution has specific <<<mvnw>>>/<<<mvnw.cmd>>> scripts to manage different strategies to get {{{../maven-wrapper/}<<<maven-wrapper.jar>>>}}:
+
+ - <<<script>>> (default): <<<mvnw>>>/<<<mvnw.cmd>>> scripts will download {{{../maven-wrapper/}<<<maven-wrapper.jar>>>}} with <<<wget>>> or <<<curl>>> on Unix or PowerShell on Windows
+
+ - <<<bin>>>: no need to download <<<maven-wrapper.jar>>> binary, it is directly provided and used from project source tree:
+
+----
+.mvn/wrapper/maven-wrapper.jar
+----
+
+ - <<<source>>>: <<<mvnw>>>/<<<mvnw.cmd>>> scripts will compile <<<MavenWrapperDownloader.java>>> source then run the class to download {{{../maven-wrapper/}<<<maven-wrapper.jar>>>}}:
+
+----
+.mvn/wrapper/MavenWrapperDownloader.java
+----
+
+ []
+
+ Distribution can be installed in a project either by unpacking zip archive by hand, or by using {{{/plugins/maven-wrapper-plugin/}<<<wrapper:wrapper>>>}}.
diff --git a/apache-maven-wrapper/src/site/site.xml b/apache-maven-wrapper/src/site/site.xml
new file mode 100644
index 0000000..cd7807c
--- /dev/null
+++ b/apache-maven-wrapper/src/site/site.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 661071c..40cfb25 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -125,7 +125,7 @@ under the License.
<configuration>
<excludes combine.children="append">
<exclude>src/assembly/maven/bin/m2.conf</exclude>
- <!-- these are partial scripts, resulting in mvn/mwnw scripts -->
+ <!-- these are partial scripts, resulting in mvn scripts -->
<exclude>src/assembly/shared/init</exclude>
<exclude>src/assembly/shared/init.cmd</exclude>
<exclude>src/assembly/shared/mvnlauncher</exclude>
@@ -134,10 +134,6 @@ under the License.
<exclude>src/assembly/shared/mvnvalidate.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>
</configuration>
</plugin>
diff --git a/maven-wrapper/src/site/apt/index.apt b/maven-wrapper/src/site/apt/index.apt
index 42d71ca..bf70504 100644
--- a/maven-wrapper/src/site/apt/index.apt
+++ b/maven-wrapper/src/site/apt/index.apt
@@ -25,4 +25,6 @@
Maven Wrapper
- Maven Wrapper...
\ No newline at end of file
+ Maven Wrapper dowloads Maven distribution if not already in cache, then launches Maven.
+
+ It is called by {{{../apache-maven-wrapper/}<<<mvnw>>>/<<<mvnw.cmd>>> scripts}} that need to be installed in the project and called instead of <<<mvn>>>/<<<mvn.cmd>>>.
diff --git a/pom.xml b/pom.xml
index eb63fa1..cbaa25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@ under the License.
<module>maven-compat</module>
<module>apache-maven</module> <!-- rename to apache-maven/maven.pom after RAT-268 -->
<module>maven-wrapper</module>
- <module>apache-maven/maven-wrapper.pom</module>
+ <module>apache-maven-wrapper</module>
<module>maven-toolchain-model</module>
<module>maven-toolchain-builder</module>
</modules>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index af12e70..a00e276 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -42,7 +42,7 @@ under the License.
<p>
<img src="images/maven-deps.png" width="1046" height="784" border="0" usemap="#Maven_dependencies" />
<map name="Maven_dependencies">
- <area shape="rect" coords="433,1,658,41" alt="apache-maven-wrapper" href="apache-maven/" />
+ <area shape="rect" coords="433,1,658,41" alt="apache-maven-wrapper" href="apache-maven-wrapper/" />
<area shape="rect" coords="711,0,959,40" alt="maven-wrapper-plugin" href="/plugins/maven-wrapper-plugin/" />
<area shape="rect" coords="488,67,604,107" alt="maven-wrapper" href="maven-wrapper/" />
<area shape="rect" coords="378,132,467,172" alt="maven-bom" href="maven-bom/" />