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/13 19:15:04 UTC
[maven] branch MNG-6914_2 updated (6dd659b -> e584207)
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.
discard 6dd659b [MNG-6914] move assembly descriptors to src/assembly
discard f7ff3f5 [MNG-6914] move apache-maven-wrapper to its own separate Maven module
discard fd96d7f [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared
discard 4fabaff [MNG-6914] move common wrapper distributions conf to shared.xml
discard 940efb0 [MNG-6914] move download script to wrapper/shared
discard 005688f [MNG-6914] drop tar.gz archives for wrapper install distributions
discard db9c56b [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
discard cf6dae2 [MNG-6914] rename .mvn hidden directory in source to mvn
add 8852b87 [MNG-7270] Switch to shell alternative to "which"
add ffc2b99 [MNG-6389] Move the toolchains model to a separate artifactId
new 972c6ec [MNG-6914] rename .mvn hidden directory in source to mvn
new 70b069f [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
new 1c07b55 [MNG-6914] drop tar.gz archives for wrapper install distributions
new 79b8172 [MNG-6914] move download script to wrapper/shared
new 26fb6f1 [MNG-6914] move common wrapper distributions conf to shared.xml
new 6f6c719 [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared
new 8f5c923 [MNG-6914] move apache-maven-wrapper to its own separate Maven module
new e584207 [MNG-6914] move assembly descriptors to src/assembly
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6dd659b)
\
N -- N -- N refs/heads/MNG-6914_2 (e584207)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 8 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:
apache-maven/src/assembly/shared/init | 2 +-
maven-bom/pom.xml | 10 +++
maven-core/pom.xml | 14 ++++-
.../maven/toolchain/DefaultToolchainTest.java | 48 ++++++++------
maven-toolchain-builder/pom.xml | 70 +++++++++++++++++++++
.../building/DefaultToolchainsBuilder.java | 0
.../building/DefaultToolchainsBuildingRequest.java | 0
.../building/DefaultToolchainsBuildingResult.java | 0
.../toolchain/building/ToolchainsBuilder.java | 0
.../building/ToolchainsBuildingException.java | 0
.../building/ToolchainsBuildingRequest.java | 0
.../building/ToolchainsBuildingResult.java | 0
.../toolchain/io/DefaultToolchainsReader.java | 0
.../toolchain/io/DefaultToolchainsWriter.java | 0
.../toolchain/io/ToolchainsParseException.java | 0
.../maven/toolchain/io/ToolchainsReader.java | 0
.../maven/toolchain/io/ToolchainsWriter.java | 0
.../toolchain/merge/MavenToolchainMerger.java | 0
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 8 +--
.../toolchain/merge/MavenToolchainMergerTest.java | 0
.../org/apache/maven/toolchain/global.xml | 0
.../toolchain/model/toolchains-jdks-extend.xml | 0
.../toolchain/model/toolchains-jdks-extra.xml | 0
.../maven/toolchain/model/toolchains-jdks.xml | 0
.../resources/org/apache/maven/toolchain/user.xml | 0
maven-toolchain-model/pom.xml | 59 +++++++++++++++++
.../src/main/mdo/toolchains.mdo | 0
pom.xml | 2 +
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
30 files changed, 186 insertions(+), 29 deletions(-)
create mode 100644 maven-toolchain-builder/pom.xml
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml (100%)
create mode 100644 maven-toolchain-model/pom.xml
rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)
[maven] 05/08: [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 26fb6f1ae042d5779a50aaa5dabfc6528d4deec3
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 | 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>
[maven] 03/08: [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 1c07b556d79a1729c733edeaadb977600b539346
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] 08/08: [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 MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e584207bdd218d5938abafc9b39c898209fc667a
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] 01/08: [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 972c6ecf8cf65d7ae7672f2f85246ecbf1516ab8
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] 04/08: [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 79b8172e8fbb408442860c46957bb5dbde9dffd1
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] 06/08: [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 MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6f6c7198cb427853e7be054a9b15a05046f5813e
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 | 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
[maven] 07/08: [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 MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8f5c9235b468504c7fac0187b6cb69cef02925d2
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
---
Jenkinsfile | 6 +++-
Jenkinsfile.its | 2 +-
.../pom.xml | 31 ++++++------------
.../src/assembly}/bin.xml | 2 +-
.../src/assembly}/script.xml | 2 +-
.../src/assembly}/shared.xml | 26 +++++++--------
.../src/assembly}/shared/download | 0
.../src/assembly}/shared/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 | 4 +--
.../source/mvn/wrapper/MavenWrapperDownloader.java | 0
.../src/site/apt/index.apt.vm | 38 +++++++++++++++++++---
.../src/site/site.xml | 24 +++++++-------
apache-maven/pom.xml | 6 +---
maven-wrapper/src/site/apt/index.apt | 4 ++-
pom.xml | 2 +-
src/site/xdoc/index.xml | 2 +-
21 files changed, 84 insertions(+), 65 deletions(-)
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 4396529..259bd88 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/shared/download</exclude>
- <exclude>src/assembly/wrapper/shared/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/shared/download</exclude>
+ <exclude>src/assembly/shared/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 94%
rename from apache-maven/src/assembly/wrapper/bin.xml
rename to apache-maven-wrapper/src/assembly/bin.xml
index 608c324..017bada 100644
--- a/apache-maven/src/assembly/wrapper/bin.xml
+++ b/apache-maven-wrapper/src/assembly/bin.xml
@@ -38,6 +38,6 @@ under the License.
</dependencySet>
</dependencySets>
<componentDescriptors>
- <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/shared.xml</componentDescriptor>
</componentDescriptors>
</assembly>
\ No newline at end of file
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven-wrapper/src/assembly/script.xml
similarity index 93%
copy from apache-maven/src/assembly/wrapper/script.xml
copy to apache-maven-wrapper/src/assembly/script.xml
index 5ccd5f8..fec447b 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven-wrapper/src/assembly/script.xml
@@ -28,6 +28,6 @@ under the License.
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/shared.xml</componentDescriptor>
</componentDescriptors>
</assembly>
\ No newline at end of file
diff --git a/apache-maven/src/assembly/wrapper/shared.xml b/apache-maven-wrapper/src/assembly/shared.xml
similarity index 70%
rename from apache-maven/src/assembly/wrapper/shared.xml
rename to apache-maven-wrapper/src/assembly/shared.xml
index 831c901..32a1694 100644
--- a/apache-maven/src/assembly/wrapper/shared.xml
+++ b/apache-maven-wrapper/src/assembly/shared.xml
@@ -23,23 +23,23 @@ 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/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/shared/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/shared/download.cmd</source>
+ <source>../apache-maven/src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
<outputDirectory>.</outputDirectory>
@@ -48,11 +48,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/shared/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/shared/download</source>
+ <source>../apache-maven/src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
<outputDirectory>.</outputDirectory>
@@ -63,7 +63,7 @@ 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>
diff --git a/apache-maven/src/assembly/wrapper/shared/download b/apache-maven-wrapper/src/assembly/shared/download
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/download
rename to apache-maven-wrapper/src/assembly/shared/download
diff --git a/apache-maven/src/assembly/wrapper/shared/download.cmd b/apache-maven-wrapper/src/assembly/shared/download.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/shared/download.cmd
rename to apache-maven-wrapper/src/assembly/shared/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 90%
rename from apache-maven/src/assembly/wrapper/source.xml
rename to apache-maven-wrapper/src/assembly/source.xml
index 1fdc1e2..63f7a2b 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven-wrapper/src/assembly/source.xml
@@ -28,11 +28,11 @@ under the License.
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
- <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor>
+ <componentDescriptor>src/assembly/shared.xml</componentDescriptor>
</componentDescriptors>
<fileSets>
<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/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/maven-wrapper/src/site/apt/index.apt b/apache-maven-wrapper/src/site/apt/index.apt.vm
similarity index 50%
copy from maven-wrapper/src/site/apt/index.apt
copy to apache-maven-wrapper/src/site/apt/index.apt.vm
index 42d71ca..5931d9a 100644
--- a/maven-wrapper/src/site/apt/index.apt
+++ b/apache-maven-wrapper/src/site/apt/index.apt.vm
@@ -16,13 +16,43 @@
~~ under the License.
-----
- Introduction
+ ${project.name}
-----
Hervé Boutemy
-----
- 2021-04-05
+ 2021-10-10
-----
-Maven Wrapper
+${project.name}
- Maven Wrapper...
\ No newline at end of file
+ ${project.description}
+
+ Distributions types share the same base content:
+
+ - <<<script>>> (default): contains only scripts that will download {{{../maven-wrapper/}<<<maven-wrapper.jar>>>}} with <<<wget>>> or <<<curl>>> on Unix or PowerShell on Windows:
+
+----
+mvnw
+mvnw.cmd
+mvnwDebug
+mvnwDebug.cmd
+.mvn/wrapper/maven-wrapper.properties
+----
+
+ - <<<bin>>>: in addition to <<<scripts>>>, provides <<<maven-wrapper.jar>>> binary:
+
+----
+.mvn/wrapper/maven-wrapper.jar
+----
+
+ - <<<source>>>: in addition to <<<scripts>>>, provides <<<MavenWrapperDownloader.java>>> source:
+
+----
+.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>>>}}.
+
+
\ No newline at end of file
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven-wrapper/src/site/site.xml
similarity index 58%
rename from apache-maven/src/assembly/wrapper/script.xml
rename to apache-maven-wrapper/src/site/site.xml
index 5ccd5f8..cd7807c 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven-wrapper/src/site/site.xml
@@ -9,7 +9,7 @@ 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
+ 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
@@ -19,15 +19,13 @@ 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>
- <componentDescriptors>
- <componentDescriptor>src/assembly/wrapper/shared.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
\ No newline at end of file
+<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 6436534..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/shared/download</exclude>
- <exclude>src/assembly/wrapper/shared/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/" />
[maven] 02/08: [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 70b069fb049d151355265e4162c6b911b29c1945
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