date:20211013

[maven-assembly-plugin] branch dependabot/maven/org.apache.maven-maven-aether-provider-3.3.9 created (now c79239b)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.apache.maven-maven-aether-provider-3.3.9
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at c79239b  Bump maven-aether-provider from 3.0 to 3.3.9

No new revisions were added by this update.

[maven-assembly-plugin] branch dependabot/maven/org.apache.maven.plugin-testing-maven-plugin-testing-harness-3.3.0 created (now f7c4a5d)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.apache.maven.plugin-testing-maven-plugin-testing-harness-3.3.0
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at f7c4a5d  Bump maven-plugin-testing-harness from 2.1 to 3.3.0

No new revisions were added by this update.

[maven-jar-plugin] branch master updated (09bc185 -> e4a728c)

2021-10-13 Thread olamy

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


from 09bc185  Merge pull request #20 from 
apache/dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4
 add fa0b0be  Bump plexus-archiver from 4.2.3 to 4.2.5
 add e4a728c  Merge pull request #23 from 
apache/dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-jar-plugin] branch master updated (cc5256e -> 09bc185)

2021-10-13 Thread olamy

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


from cc5256e  add gh actions
 add bf30b44  Bump maven-shared-utils from 3.3.3 to 3.3.4
 new 09bc185  Merge pull request #20 from 
apache/dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4

The 1 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:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-jar-plugin] 01/01: Merge pull request #20 from apache/dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4

2021-10-13 Thread olamy

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git

commit 09bc18568eb27c57a9a35fdb77df023f51ba1686
Merge: cc5256e bf30b44
Author: Olivier Lamy 
AuthorDate: Thu Oct 14 14:33:50 2021 +1000

Merge pull request #20 from 
apache/dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4

Bump maven-shared-utils from 3.3.3 to 3.3.4

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-help-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 created (now 5468c0f)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.


  at 5468c0f  Bump plexus-utils from 3.3.0 to 3.4.1

No new revisions were added by this update.

[maven-jar-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5 created (now fa0b0be)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


  at fa0b0be  Bump plexus-archiver from 4.2.3 to 4.2.5

No new revisions were added by this update.

[maven-jar-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 created (now 2545426)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


  at 2545426  Bump plexus-utils from 3.3.0 to 3.4.1

No new revisions were added by this update.

[maven-jar-plugin] branch dependabot/maven/mavenVersion-3.8.3 created (now 4d6f468)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/maven/mavenVersion-3.8.3
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


  at 4d6f468  Bump mavenVersion from 3.1.0 to 3.8.3

No new revisions were added by this update.

[maven-jar-plugin] branch dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4 created (now bf30b44)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.3.4
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git.


  at bf30b44  Bump maven-shared-utils from 3.3.3 to 3.3.4

No new revisions were added by this update.

[maven-assembly-plugin] branch dependabot/maven/commons-io-commons-io-2.11.0 created (now 16a76ee)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/commons-io-commons-io-2.11.0
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at 16a76ee  Bump commons-io from 2.6 to 2.11.0

No new revisions were added by this update.

[maven-assembly-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 created (now e072f58)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at e072f58  Bump plexus-utils from 3.3.0 to 3.4.1

No new revisions were added by this update.

[maven-assembly-plugin] branch dependabot/maven/org.sonatype.sisu-sisu-inject-plexus-2.6.0 created (now fc001c9)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.sonatype.sisu-sisu-inject-plexus-2.6.0
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at fc001c9  Bump sisu-inject-plexus from 1.4.2 to 2.6.0

No new revisions were added by this update.

[maven-assembly-plugin] branch master updated: add simple gh actions

2021-10-13 Thread olamy

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 8ad3645  add simple gh actions
8ad3645 is described below

commit 8ad3645052c38714969f8e0949f5a8a10955c857
Author: Olivier Lamy 
AuthorDate: Thu Oct 14 11:27:20 2021 +1000

add simple gh actions

Signed-off-by: Olivier Lamy 
---
 .github/dependabot.yml  | 27 ++
 .github/workflows/maven.yml | 46 +
 2 files changed, 73 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000..9c76191
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+# 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. 
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+directory: "/"
+schedule:
+  interval: "daily"
+  - package-ecosystem: "github-actions"
+directory: "/"
+schedule:
+  interval: "daily"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000..8994aa7
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,46 @@
+# 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.
+
+name: GitHub CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+strategy:
+  matrix:
+os: [ubuntu-latest, windows-latest, macOS-latest]
+java: [8, 11, 17]
+jdk: [temurin, zulu]
+  fail-fast: false
+
+runs-on: ${{ matrix.os }}
+
+steps:
+  - name: Checkout
+uses: actions/checkout@v2.3.4
+
+  - name: Set up JDK
+uses: actions/setup-java@v2
+with:
+  distribution: ${{ matrix.jdk }}
+  java-version: ${{ matrix.java }}
+  cache: 'maven'
+
+  - name: Build with Maven
+run: mvn verify --errors --batch-mode --show-version -P run-its

[maven-jar-plugin] branch master updated: add gh actions

2021-10-13 Thread olamy

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new cc5256e  add gh actions
cc5256e is described below

commit cc5256e33ebc24cb54aa786892857d22c46ebddd
Author: Olivier Lamy 
AuthorDate: Thu Oct 14 11:19:50 2021 +1000

add gh actions

Signed-off-by: Olivier Lamy 
---
 .github/dependabot.yml  | 27 ++
 .github/workflows/maven.yml | 46 +
 2 files changed, 73 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000..9c76191
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+# 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. 
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+directory: "/"
+schedule:
+  interval: "daily"
+  - package-ecosystem: "github-actions"
+directory: "/"
+schedule:
+  interval: "daily"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000..8994aa7
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,46 @@
+# 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.
+
+name: GitHub CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+strategy:
+  matrix:
+os: [ubuntu-latest, windows-latest, macOS-latest]
+java: [8, 11, 17]
+jdk: [temurin, zulu]
+  fail-fast: false
+
+runs-on: ${{ matrix.os }}
+
+steps:
+  - name: Checkout
+uses: actions/checkout@v2.3.4
+
+  - name: Set up JDK
+uses: actions/setup-java@v2
+with:
+  distribution: ${{ matrix.jdk }}
+  java-version: ${{ matrix.java }}
+  cache: 'maven'
+
+  - name: Build with Maven
+run: mvn verify --errors --batch-mode --show-version -P run-its

[maven] branch master updated: [MNG-7298] - Avoid redundant conditions.

2021-10-13 Thread slachiewicz

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
 new 4c21e11  [MNG-7298] - Avoid redundant conditions.
4c21e11 is described below

commit 4c21e11b011999d8455d4406a07bcc2e6eaa73ae
Author: Arturo Bernal 
AuthorDate: Mon Oct 11 21:30:26 2021 +0200

[MNG-7298] - Avoid redundant conditions.
---
 .../main/java/org/apache/maven/artifact/versioning/VersionRange.java| 2 +-
 .../repository/legacy/resolver/DefaultLegacyArtifactCollector.java  | 2 +-
 .../java/org/apache/maven/repository/metadata/MetadataGraphVertex.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 3bf0658..67bde82 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -160,7 +160,7 @@ public class VersionRange
 
 process = process.substring( index + 1 ).trim();
 
-if ( process.length() > 0 && process.startsWith( "," ) )
+if ( process.startsWith( "," ) )
 {
 process = process.substring( 1 ).trim();
 }
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 69c72bf..048ce8f 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -214,7 +214,7 @@ public class DefaultLegacyArtifactCollector
  Map 
managedVersions )
 {
 ManagedVersionMap versionMap;
-if ( ( managedVersions != null ) && ( managedVersions instanceof 
ManagedVersionMap ) )
+if ( managedVersions instanceof ManagedVersionMap )
 {
 versionMap = (ManagedVersionMap) managedVersions;
 }
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
index 495d061..f24c395 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
@@ -175,7 +175,7 @@ public class MetadataGraphVertex
 @Override
 public boolean equals( Object vo )
 {
-if ( vo == null || !( vo instanceof MetadataGraphVertex ) )
+if ( !( vo instanceof MetadataGraphVertex ) )
 {
 return false;
 }

[maven] branch master updated: [MNG-7303] - Replace Throwable.initCause() with constructor.

2021-10-13 Thread slachiewicz

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
 new 274388f  [MNG-7303] - Replace Throwable.initCause() with constructor.
274388f is described below

commit 274388fc0fa8f2b6fc8239683a7462889493f8d3
Author: Arturo Bernal 
AuthorDate: Wed Oct 13 21:29:13 2021 +0200

[MNG-7303] - Replace Throwable.initCause() with constructor.
---
 .../main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java  | 2 +-
 .../java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
index 8d732c1..6880e7a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
@@ -108,7 +108,7 @@ public class ExtensionDescriptorBuilder
 }
 catch ( XmlPullParserException e )
 {
-throw (IOException) new IOException( e.getMessage() ).initCause( e 
);
+throw new IOException( e.getMessage(), e );
 }
 
 if ( !"extension".equals( dom.getName() ) )
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 3c173ec..06fbb5d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -99,7 +99,7 @@ public class DefaultMavenSettingsBuilder
 }
 catch ( SettingsBuildingException e )
 {
-throw (IOException) new IOException( e.getMessage() ).initCause( e 
);
+throw new IOException( e.getMessage(), e );
 }
 }

[maven-artifact-plugin] branch master updated: [MARTIFACT-25] check pom.xml against reference .pom

2021-10-13 Thread hboutemy

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-artifact-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 584a72e  [MARTIFACT-25] check pom.xml against reference .pom
584a72e is described below

commit 584a72e2e85c74d0e521036cf21c1b06faed39bb
Author: Hervé Boutemy 
AuthorDate: Wed Oct 13 22:48:29 2021 +0200

[MARTIFACT-25] check pom.xml against reference .pom
---
 src/it/buildinfo-mono/verify.groovy|  3 +-
 src/it/buildinfo-multi/verify.groovy   |  6 +-
 src/it/buildinfo-skip-install-deploy/verify.groovy |  6 +-
 src/it/compare-mono/invoker.properties | 19 ++
 src/it/compare-mono/pom.xml| 71 ++
 src/it/compare-mono/verify.groovy  | 33 ++
 .../artifact/buildinfo/BuildInfoWriter.java| 16 +++--
 .../plugins/artifact/buildinfo/CompareMojo.java|  9 ++-
 .../artifact/buildinfo/ReferenceBuildinfoUtil.java |  4 +-
 9 files changed, 153 insertions(+), 14 deletions(-)

diff --git a/src/it/buildinfo-mono/verify.groovy 
b/src/it/buildinfo-mono/verify.groovy
index ff2d6e8..f1e35a1 100644
--- a/src/it/buildinfo-mono/verify.groovy
+++ b/src/it/buildinfo-mono/verify.groovy
@@ -25,7 +25,8 @@ assert buildinfoFile.isFile()
 // check generated buildinfo content
 String buildinfo = buildinfoFile.text
 
-assert buildinfo.contains( "outputs.0.filename=mono-1.0-SNAPSHOT.jar" )
+assert buildinfo.contains( "outputs.0.filename=mono-1.0-SNAPSHOT.pom" )
+assert buildinfo.contains( "outputs.1.filename=mono-1.0-SNAPSHOT.jar" )
 assert buildinfo.contains( "mvn.minimum.version=3.0.5" )
 
 // check existence of buildinfo in local repository
diff --git a/src/it/buildinfo-multi/verify.groovy 
b/src/it/buildinfo-multi/verify.groovy
index a0778a9..81e47b1 100644
--- a/src/it/buildinfo-multi/verify.groovy
+++ b/src/it/buildinfo-multi/verify.groovy
@@ -37,9 +37,11 @@ assert buildinfo.contains( 
"group-id=org.apache.maven.plugins.it" )
 assert buildinfo.contains( "artifact-id=multi" )
 assert buildinfo.contains( "version=1.0-SNAPSHOT" )
 assert buildinfo.contains( 
"outputs.1.coordinates=org.apache.maven.plugins.it:multi-modA" )
-assert buildinfo.contains( "outputs.1.0.filename=multi-modA-1.0-SNAPSHOT.jar" )
+assert buildinfo.contains( "outputs.1.0.filename=multi-modA-1.0-SNAPSHOT.pom" )
+assert buildinfo.contains( "outputs.1.1.filename=multi-modA-1.0-SNAPSHOT.jar" )
 assert buildinfo.contains( 
"outputs.2.coordinates=org.apache.maven.plugins.it:multi-modB" )
-assert buildinfo.contains( "outputs.2.0.filename=multi-modB-1.0-SNAPSHOT.jar" )
+assert buildinfo.contains( "outputs.2.0.filename=multi-modB-1.0-SNAPSHOT.pom" )
+assert buildinfo.contains( "outputs.2.1.filename=multi-modB-1.0-SNAPSHOT.jar" )
 assert !buildinfo.contains( ".buildinfo" )
 assert buildinfo.contains( "mvn.aggregate.artifact-id=multi-modB" )
 
diff --git a/src/it/buildinfo-skip-install-deploy/verify.groovy 
b/src/it/buildinfo-skip-install-deploy/verify.groovy
index bd814e1..2e4a479 100644
--- a/src/it/buildinfo-skip-install-deploy/verify.groovy
+++ b/src/it/buildinfo-skip-install-deploy/verify.groovy
@@ -34,9 +34,11 @@ assert buildinfo.contains( 
"group-id=org.apache.maven.plugins.it" )
 assert buildinfo.contains( "artifact-id=multi" )
 assert buildinfo.contains( "version=1.0-SNAPSHOT" )
 assert buildinfo.contains( 
"outputs.1.coordinates=org.apache.maven.plugins.it:multi-modA" )
-assert buildinfo.contains( "outputs.1.0.filename=multi-modA-1.0-SNAPSHOT.jar" )
+assert buildinfo.contains( "outputs.1.0.filename=multi-modA-1.0-SNAPSHOT.pom" )
+assert buildinfo.contains( "outputs.1.1.filename=multi-modA-1.0-SNAPSHOT.jar" )
 assert buildinfo.contains( 
"outputs.2.coordinates=org.apache.maven.plugins.it:multi-modB" )
-assert buildinfo.contains( "outputs.2.0.filename=multi-modB-1.0-SNAPSHOT.jar" )
+assert buildinfo.contains( "outputs.2.0.filename=multi-modB-1.0-SNAPSHOT.pom" )
+assert buildinfo.contains( "outputs.2.1.filename=multi-modB-1.0-SNAPSHOT.jar" )
 assert !buildinfo.contains( ".buildinfo" )
 assert !buildinfo.contains( "outputs.3" )
 
diff --git a/src/it/compare-mono/invoker.properties 
b/src/it/compare-mono/invoker.properties
new file mode 100644
index 000..339a145
--- /dev/null
+++ b/src/it/compare-mono/invoker.properties
@@ -0,0 +1,19 @@
+# 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

[maven-plugin-tools] branch master updated: Update maven.yml

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new cf1db12  Update maven.yml
cf1db12 is described below

commit cf1db12747cdf3e15c63e92f37b5660c9f70ad34
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 22:45:01 2021 +0200

Update maven.yml

Add IT profile as well
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index eb39c5d..e3db6db 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -46,4 +46,4 @@ jobs:
   java-version: 1.8
 
   - name: Build with Maven
-run: mvn clean verify -e -B -V
+run: mvn clean verify -e -B -V -P run-its

[maven-plugin-tools] branch master updated: [MPLUGIN-374] deprecate unused requiresReports flag

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 2bf1277  [MPLUGIN-374] deprecate unused requiresReports flag
2bf1277 is described below

commit 2bf1277a1c80baca9e81cfe6d42bc9866af884e4
Author: Slawomir Jaranowski 
AuthorDate: Mon Oct 4 21:31:48 2021 +0200

[MPLUGIN-374] deprecate unused requiresReports flag
---
 .../src/main/java/org/apache/maven/plugins/annotations/Mojo.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
 
b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
index e442310..ec5fce1 100644
--- 
a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
+++ 
b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
@@ -83,7 +83,10 @@ public @interface Mojo
 /**
  * does your mojo requires a reporting context to be executed?
  * @return requires a reporting context
+ *
+ * @deprecated unused
  */
+@Deprecated
 boolean requiresReports() default false;
 
 /**

[maven] branch MNG-6914_2 updated (e584207 -> 26c13e6)

2021-10-13 Thread hboutemy

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 e584207  [MNG-6914] move assembly descriptors to src/assembly
 discard 8f5c923  [MNG-6914] move apache-maven-wrapper to its own separate 
Maven module
 new 55831ed  [MNG-6914] move apache-maven-wrapper to its own separate 
Maven module
 new 26c13e6  [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   (e584207)
\
 N -- N -- N   refs/heads/MNG-6914_2 (26c13e6)

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 2 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 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

[maven] 01/02: [MNG-6914] move apache-maven-wrapper to its own separate Maven module

2021-10-13 Thread hboutemy

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 55831edf255e6c579d041dff79e9ca532957b951
Author: Hervé Boutemy 
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  |  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 +-
 22 files changed, 98 insertions(+), 66 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

[maven] 02/02: [MNG-6914] move assembly descriptors to src/assembly

2021-10-13 Thread hboutemy

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 26c13e689563675ffcad7b166e19fce33f02c071
Author: Hervé Boutemy 
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.
 
 
   
-src/assembly/maven/bin.xml
+src/assembly/bin.xml
   
 
   
@@ -268,7 +268,7 @@ under the License.
   false
   ${distributionTargetDir}
   
-src/assembly/maven/dir.xml
+src/assembly/dir.xml
   
 
   
@@ -292,7 +292,7 @@ under the License.
 
 
   
-src/assembly/maven/src.xml
+src/assembly/src.xml
   
   gnu
 
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.
 tar.gz
   
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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.
   
   false
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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

2021-10-13 Thread hboutemy

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 
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
   
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
   
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
 
-  src/assembly/wrapper/source
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/source/mvn
+  .mvn
   true
 
   
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] 08/08: [MNG-6914] move assembly descriptors to src/assembly

2021-10-13 Thread hboutemy

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 
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.
 
 
   
-src/assembly/maven/bin.xml
+src/assembly/bin.xml
   
 
   
@@ -268,7 +268,7 @@ under the License.
   false
   ${distributionTargetDir}
   
-src/assembly/maven/dir.xml
+src/assembly/dir.xml
   
 
   
@@ -292,7 +292,7 @@ under the License.
 
 
   
-src/assembly/maven/src.xml
+src/assembly/src.xml
   
   gnu
 
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.
 tar.gz
   
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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.
   
   false
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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] 07/08: [MNG-6914] move apache-maven-wrapper to its own separate Maven module

2021-10-13 Thread hboutemy

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 
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.
   pom
 
   Apache Maven Wrapper Distribution
-  The Apache Maven Wrapper distribution in zip and tar.gz 
formats.
+  The Apache Maven Wrapper distribution zips in 3 types: script, 
bin and source.
 
   
 
@@ -42,19 +42,11 @@ under the License.
   
 
   src/assembly/maven/bin/m2.conf
-  
-  src/assembly/shared/init
-  src/assembly/shared/init.cmd
-  src/assembly/shared/mvnlauncher
-  src/assembly/shared/mvnlauncher.cmd
-  src/assembly/shared/mvnvalidate
-  src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/run
-

[maven] 02/08: [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)

2021-10-13 Thread hboutemy

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 
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] 04/08: [MNG-6914] move download script to wrapper/shared

2021-10-13 Thread hboutemy

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 
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.
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
 src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/script/download.cmd
+src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
   mvnw.cmd
@@ -57,7 +57,7 @@ under the License.
 src/assembly/shared/validate
 src/assembly/shared/init
 src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/script/download
+src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
   mvnw
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.
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
 src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/source/download.cmd
+src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
   mvnw.cmd
@@ -57,7 +57,7 @@ under the License.
 src/assembly/shared/validate
 src/assembly/shared/init
 src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/source/download
+src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
   mvnw
diff --git a/apache-maven/src/assembly/wrapper/source/download 
b/apache-maven/src/assembly/wrapper/source/download
deleted file mode 100644
index 30cf5e4..000
--- 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

[maven] 05/08: [MNG-6914] move common wrapper distributions conf to shared.xml

2021-10-13 Thread hboutemy

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 
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.
   maven-wrapper.jar
 
   
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-src/assembly/shared/run
-  
-  mvnw
-  .
-  unix
-  0755
-  true
-
-  
-  
-
-  src/assembly/wrapper/shared/mvn
-  .mvn
-  true
-
-  
+  
+src/assembly/wrapper/shared.xml
+  
 
\ 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.
 zip
   
   false
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/shared/download.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/shared/download
-src/assembly/shared/run
-  
-  mvnw
-  .
-  unix
-  0755
-  true
-
-  
-  
-
-  src/assembly/wrapper/shared/mvn
-  .mvn
-  true
-
-  
+  
+src/assembly/wrapper/shared.xml
+  
 
\ 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.
 -->
 
-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;>
-  script
-  
-zip
-  
-  false
+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;>
   
 
   src/assembly/shared/mvnwDebug.cmd
@@ -74,4 +68,4 @@ under the License.
   true
 
   
-
\ No newline at end of file
+
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.
 zip
   
   false
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/shared/download.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-

[maven] 06/08: [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared

2021-10-13 Thread hboutemy

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 
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.
   src/assembly/shared/mvnlauncher.cmd
   src/assembly/shared/mvnvalidate
   src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/mvnwlauncher
-  src/assembly/shared/mvnwlauncher.cmd
   src/assembly/shared/run
   src/assembly/shared/run.cmd
-  src/assembly/wrapper/*/download
-  src/assembly/wrapper/*/download.cmd
+  src/assembly/wrapper/shared/mvnwlauncher
+  src/assembly/wrapper/shared/mvnwlauncher.cmd
+  src/assembly/wrapper/shared/download
+  src/assembly/wrapper/shared/download.cmd
 
   
 
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.
   src/assembly/shared/mvnlauncher.cmd
   src/assembly/shared/mvnvalidate
   src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/mvnwlauncher
-  src/assembly/shared/mvnwlauncher.cmd
   src/assembly/shared/run
   src/assembly/shared/run.cmd
-  src/assembly/wrapper/*/download
-  src/assembly/wrapper/*/download.cmd
+  src/assembly/wrapper/shared/mvnwlauncher
+  src/assembly/wrapper/shared/mvnwlauncher.cmd
+  src/assembly/wrapper/shared/download
+  src/assembly/wrapper/shared/download.cmd
 
   
 
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;>
   
 
-  src/assembly/shared/mvnwDebug.cmd
+  src/assembly/wrapper/shared/mvnwDebug.cmd
   .
   dos
 
 
-  src/assembly/shared/mvnwDebug
+  src/assembly/wrapper/shared/mvnwDebug
   .
   unix
   0755
@@ -37,7 +37,7 @@ under the License.
   
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
+src/assembly/wrapper/shared/mvnwlauncher.cmd
 src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
@@ -50,7 +50,7 @@ under the License.
   
 src/assembly/shared/validate
 src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
+src/assembly/wrapper/shared/mvnwlauncher
 src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
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

[maven] branch MNG-6914_2 updated (6dd659b -> e584207)

2021-10-13 Thread hboutemy

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] 03/08: [MNG-6914] drop tar.gz archives for wrapper install distributions

2021-10-13 Thread hboutemy

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 
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;>
   bin
   
-tar.gz
 zip
   
   false
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;>
   script
   
-tar.gz
 zip
   
   false
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;>
   source
   
-tar.gz
 zip
   
   false

[maven-doap-plugin] branch stabilize deleted (was 5473f9b)

2021-10-13 Thread rfscholte

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git.


 was 5473f9b  Fix JavaDoc

This change permanently discards the following revisions:

 discard 5473f9b  Fix JavaDoc
 discard 74521c9  Fix JavaDoc

[maven-doap-plugin] branch master updated: Fix JavaDoc

2021-10-13 Thread rfscholte

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 608228e  Fix JavaDoc
608228e is described below

commit 608228e80ced47f17c4f8b0753a338291667b6d0
Author: rfscholte 
AuthorDate: Wed Oct 13 20:20:13 2021 +0200

Fix JavaDoc
---
 .../org/apache/maven/plugin/doap/DoapMojo.java |  8 ++--
 src/main/mdo/asfextOptions.mdo | 10 ++---
 src/main/mdo/doapOptions.mdo   | 48 +++---
 .../org/apache/maven/plugin/doap/DoapUtilTest.java |  2 +-
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java 
b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
index f11166d..211374a 100644
--- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
+++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
@@ -81,10 +81,12 @@ import java.util.Set;
 import java.util.TimeZone;
 
 /**
+ * 
  * Generate a http://usefulinc.com/ns/doap;>Description of a Project 
(DOAP) file from the main information
- * found in a POM. 
- * Note: The generated file is tailored for use by projects at http://projects.apache.org/doap.html;>Apache.
+ * found in a POM.
+ * 
+ * Note: The generated file is tailored for use by projects at
+ * http://projects.apache.org/doap.html;>Apache.
  *
  * @author Jason van Zyl
  * @author mailto:vincent.sive...@gmail.com;>Vincent Siveton
diff --git a/src/main/mdo/asfextOptions.mdo b/src/main/mdo/asfextOptions.mdo
index 420f8e7..0efaaf2 100644
--- a/src/main/mdo/asfextOptions.mdo
+++ b/src/main/mdo/asfextOptions.mdo
@@ -43,7 +43,7 @@ 
http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext<
   
 
   xmlnsPrefix
-  
   1.0.0
   String
@@ -51,7 +51,7 @@ 
http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext<
 
 
   xmlnsNamespaceURI
-  
   1.0.0
   String
@@ -66,7 +66,7 @@ 
http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext<
 
 
   pmc
-  
   1.0.0
@@ -76,7 +76,7 @@ 
http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext<
 
 
   name
-  
   1.0.0
@@ -95,7 +95,7 @@ 
http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext<
 
 
   chair
-  
   1.0.0
diff --git a/src/main/mdo/doapOptions.mdo b/src/main/mdo/doapOptions.mdo
index e8d7a5e..5acbf60 100644
--- a/src/main/mdo/doapOptions.mdo
+++ b/src/main/mdo/doapOptions.mdo
@@ -47,7 +47,7 @@ some POM options.
 
 
   xmlnsNamespaceURI
-  
   1.0.0
   String
@@ -71,7 +71,7 @@ some POM options.
 
 
   bugDatabase
-  
   1.0.0
@@ -81,8 +81,8 @@ some POM options.
 
 
   category
-  
   1.0.0
@@ -92,7 +92,7 @@ some POM options.
 
 
   created
-  
   1.0.0
@@ -102,7 +102,7 @@ some POM options.
 
 
   description
-  
   1.0.0
@@ -112,7 +112,7 @@ some POM options.
 
 
   downloadPage
-  
   1.0.0
@@ -122,7 +122,7 @@ some POM options.
 
 
   downloadMirror
-  
   1.0.0
@@ -131,7 +131,7 @@ some POM options.
 
 
   homepage
-  
   1.0.0
@@ -141,7 +141,7 @@ some POM options.
 
 
   implementations
-  
   1.0.0
@@ -159,7 +159,7 @@ some POM options.
 
 
   license
-  
   1.0.0
@@ -169,8 +169,8 @@ some POM options.
 
 
   mailingList
-  
   1.0.0
@@ -180,7 +180,7 @@ some POM options.
 
 
   name
-  
   1.0.0
@@ -198,7 +198,7 @@ some POM options.
 
 
   os
-  
   1.0.0
@@ -207,7 +207,7 @@ some POM options.
 
 
   platform
-  
   1.0.0
@@ -216,8 +216,8 @@ some POM options.
 
 
   programmingLanguage
-  
   1.0.0
@@ -227,7 +227,7 @@ some POM options.
 
 
   scmAnonymous
-  
   1.0.0
@@ -277,7 +277,7 @@ some POM options.
 
 
   vendor
-  
   1.0.0
@@ -345,8 +345,8 @@ some POM options.

[maven] 07/08: [MNG-6914] move apache-maven-wrapper to its own separate Maven module

2021-10-13 Thread hboutemy

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 f7ff3f5f1875e781c5ea4bb91bad5535f8407925
Author: Hervé Boutemy 
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.
   pom
 
   Apache Maven Wrapper Distribution
-  The Apache Maven Wrapper distribution in zip and tar.gz 
formats.
+  The Apache Maven Wrapper distribution zips in 3 types: script, 
bin and source.
 
   
 
@@ -42,19 +42,11 @@ under the License.
   
 
   src/assembly/maven/bin/m2.conf
-  
-  src/assembly/shared/init
-  src/assembly/shared/init.cmd
-  src/assembly/shared/mvnlauncher
-  src/assembly/shared/mvnlauncher.cmd
-  src/assembly/shared/mvnvalidate
-  src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/run
-

[maven] 06/08: [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared

2021-10-13 Thread hboutemy

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit fd96d7fe1a23d8395bdae0a69e4a30b52cebdd59
Author: Hervé Boutemy 
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.
   src/assembly/shared/mvnlauncher.cmd
   src/assembly/shared/mvnvalidate
   src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/mvnwlauncher
-  src/assembly/shared/mvnwlauncher.cmd
   src/assembly/shared/run
   src/assembly/shared/run.cmd
-  src/assembly/wrapper/*/download
-  src/assembly/wrapper/*/download.cmd
+  src/assembly/wrapper/shared/mvnwlauncher
+  src/assembly/wrapper/shared/mvnwlauncher.cmd
+  src/assembly/wrapper/shared/download
+  src/assembly/wrapper/shared/download.cmd
 
   
 
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.
   src/assembly/shared/mvnlauncher.cmd
   src/assembly/shared/mvnvalidate
   src/assembly/shared/mvnvalidate.cmd
-  src/assembly/shared/mvnwlauncher
-  src/assembly/shared/mvnwlauncher.cmd
   src/assembly/shared/run
   src/assembly/shared/run.cmd
-  src/assembly/wrapper/*/download
-  src/assembly/wrapper/*/download.cmd
+  src/assembly/wrapper/shared/mvnwlauncher
+  src/assembly/wrapper/shared/mvnwlauncher.cmd
+  src/assembly/wrapper/shared/download
+  src/assembly/wrapper/shared/download.cmd
 
   
 
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;>
   
 
-  src/assembly/shared/mvnwDebug.cmd
+  src/assembly/wrapper/shared/mvnwDebug.cmd
   .
   dos
 
 
-  src/assembly/shared/mvnwDebug
+  src/assembly/wrapper/shared/mvnwDebug
   .
   unix
   0755
@@ -37,7 +37,7 @@ under the License.
   
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
+src/assembly/wrapper/shared/mvnwlauncher.cmd
 src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
@@ -50,7 +50,7 @@ under the License.
   
 src/assembly/shared/validate
 src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
+src/assembly/wrapper/shared/mvnwlauncher
 src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
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

[maven] 08/08: [MNG-6914] move assembly descriptors to src/assembly

2021-10-13 Thread hboutemy

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 6dd659b3332adeb805fc6249f0357341b90ae16e
Author: Hervé Boutemy 
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.
 
 
   
-src/assembly/maven/bin.xml
+src/assembly/bin.xml
   
 
   
@@ -268,7 +268,7 @@ under the License.
   false
   ${distributionTargetDir}
   
-src/assembly/maven/dir.xml
+src/assembly/dir.xml
   
 
   
@@ -292,7 +292,7 @@ under the License.
 
 
   
-src/assembly/maven/src.xml
+src/assembly/src.xml
   
   gnu
 
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.
 tar.gz
   
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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.
   
   false
   
-src/assembly/maven/component.xml
+src/assembly/component.xml
   
 
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] 03/08: [MNG-6914] drop tar.gz archives for wrapper install distributions

2021-10-13 Thread hboutemy

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 005688f50b6a05882fd4eaef051e5f41c6e559f5
Author: Hervé Boutemy 
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;>
   bin
   
-tar.gz
 zip
   
   false
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;>
   script
   
-tar.gz
 zip
   
   false
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;>
   source
   
-tar.gz
 zip
   
   false

[maven] 01/08: [MNG-6914] rename .mvn hidden directory in source to mvn

2021-10-13 Thread hboutemy

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 cf6dae201d1a9e26cbd135453da81acefec8eef6
Author: Hervé Boutemy 
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
   
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
   
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.
   
   
 
-  src/assembly/wrapper/shared
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/shared/mvn
+  .mvn
   true
 
 
-  src/assembly/wrapper/source
-  .
-  
-.mvn/**
-  
+  src/assembly/wrapper/source/mvn
+  .mvn
   true
 
   
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/08: [MNG-6914] move common wrapper distributions conf to shared.xml

2021-10-13 Thread hboutemy

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 4fabaff17821d59f553bfb275594d9010033ba8b
Author: Hervé Boutemy 
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.
   maven-wrapper.jar
 
   
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-src/assembly/shared/run
-  
-  mvnw
-  .
-  unix
-  0755
-  true
-
-  
-  
-
-  src/assembly/wrapper/shared/mvn
-  .mvn
-  true
-
-  
+  
+src/assembly/wrapper/shared.xml
+  
 
\ 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.
 zip
   
   false
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/shared/download.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/shared/download
-src/assembly/shared/run
-  
-  mvnw
-  .
-  unix
-  0755
-  true
-
-  
-  
-
-  src/assembly/wrapper/shared/mvn
-  .mvn
-  true
-
-  
+  
+src/assembly/wrapper/shared.xml
+  
 
\ 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.
 -->
 
-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;>
-  script
-  
-zip
-  
-  false
+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;>
   
 
   src/assembly/shared/mvnwDebug.cmd
@@ -74,4 +68,4 @@ under the License.
   true
 
   
-
\ No newline at end of file
+
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.
 zip
   
   false
-  
-
-  src/assembly/shared/mvnwDebug.cmd
-  .
-  dos
-
-
-  src/assembly/shared/mvnwDebug
-  .
-  unix
-  0755
-
-
-  
-src/assembly/shared/validate.cmd
-src/assembly/shared/init.cmd
-src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/shared/download.cmd
-src/assembly/shared/run.cmd
-  
-  mvnw.cmd
-  .
-  dos
-  true
-
-
-  
-src/assembly/shared/validate
-src/assembly/shared/init
-src/assembly/shared/mvnwlauncher
-

[maven] 02/08: [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)

2021-10-13 Thread hboutemy

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 db9c56b3ee9ba35ef081375db6c658fca01b5634
Author: Hervé Boutemy 
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] branch MNG-6914_2 updated (c323cd3 -> 6dd659b)

2021-10-13 Thread hboutemy

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 c323cd3  [MNG-6914] use new apache-maven-wrapper module
omit 25b9e06  [MNG-6914] fix typo
omit ac40a6a  [MNG-6914] move assembly descriptors to src/assembly
omit 4520f9e  [MNG-6914] move apache-maven-wrapper to its own separate 
Maven module
omit fb8f8e2  [MNG-6914] move mvnw scripts from maven/shared to 
wrapper/shared
omit 2423d21  [MNG-6914] move common wrapper distributions conf to 
shared.xml
omit 9f33b07  [MNG-6914] move download script to wrapper/shared
omit 0dacb2f  [MNG-6914] drop tar.gz archives for wrapper install 
distributions
omit 3a6b79c  [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from 
LAUNCHER_JAR)
omit b304c0c  [MNG-6914] rename .mvn hidden directory in source to mvn
 add b31f3ae  [MNG-7291] Avoid String concatenation in loops (#572)
 add 4daa48e  [MNG-7287]  Simplify assertion with simpler and equivalent 
calls
 add 0080e84  [MNG-7297] Remove redundant type arguments (#581)
 new cf6dae2  [MNG-6914] rename .mvn hidden directory in source to mvn
 new db9c56b  [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from 
LAUNCHER_JAR)
 new 005688f  [MNG-6914] drop tar.gz archives for wrapper install 
distributions
 new 940efb0  [MNG-6914] move download script to wrapper/shared
 new 4fabaff  [MNG-6914] move common wrapper distributions conf to 
shared.xml
 new fd96d7f  [MNG-6914] move mvnw scripts from maven/shared to 
wrapper/shared
 new f7ff3f5  [MNG-6914] move apache-maven-wrapper to its own separate 
Maven module
 new 6dd659b  [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   (c323cd3)
\
 N -- N -- N   refs/heads/MNG-6914_2 (6dd659b)

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/artifact/ArtifactUtilsTest.java   | 16 ++--
 .../apache/maven/artifact/DefaultArtifactTest.java |  5 ++--
 .../versioning/DefaultArtifactVersionTest.java |  2 +-
 .../building/DefaultProblemCollectorTest.java  |  3 ++-
 .../apache/maven/building/DefaultProblemTest.java  |  3 ++-
 .../maven/repository/MetadataResolutionResult.java |  8 +++---
 .../main/java/org/apache/maven/DefaultMaven.java   |  2 +-
 .../java/org/apache/maven/RepositoryUtils.java |  2 +-
 .../resolver/ArtifactResolutionResult.java |  8 +++---
 .../maven/classrealm/DefaultClassRealmManager.java |  2 +-
 .../apache/maven/exception/ExceptionSummary.java   |  2 +-
 .../scope/internal/MojoExecutionScopeModule.java   |  4 +--
 .../lifecycle/internal/MojoDescriptorCreator.java  |  2 +-
 .../maven/lifecycle/internal/MojoExecutor.java |  4 +--
 .../plugin/DefaultLifecycleBindingsInjector.java   |  2 +-
 .../maven/plugin/DefaultPluginRealmCache.java  |  2 +-
 .../plugin/internal/DefaultMavenPluginManager.java |  2 +-
 .../prefix/NoPluginFoundForPrefixException.java| 12 -
 .../project/DefaultDependencyResolutionResult.java |  2 +-
 .../maven/project/DefaultProjectRealmCache.java|  2 +-
 .../org/apache/maven/project/MavenProject.java |  2 +-
 .../artifact/DefaultProjectArtifactsCache.java |  4 +--
 .../maven/project/artifact/ProjectArtifact.java|  2 +-
 .../maven/session/scope/internal/SessionScope.java |  2 +-
 .../session/scope/internal/SessionScopeModule.java |  2 +-
 .../internal/LifecycleDependencyResolverTest.java  |  3 ++-
 .../apache/maven/project/PomConstructionTest.java  | 26 +--
 .../maven/model/building/DefaultModelBuilder.java  | 10 +---
 .../org/apache/maven/model/building/Result.java|  4 +--
 .../maven/plugin/descriptor/PluginDescriptor.java  |  2 +-
 .../descriptor/PluginDescriptorBuilderTest.java| 29 --
 31 files changed, 91 insertions(+), 80 deletions(-)

[maven] 04/08: [MNG-6914] move download script to wrapper/shared

2021-10-13 Thread hboutemy

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 940efb05eff2f1f2ad8921547280e41e7fab586e
Author: Hervé Boutemy 
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.
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
 src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/script/download.cmd
+src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
   mvnw.cmd
@@ -57,7 +57,7 @@ under the License.
 src/assembly/shared/validate
 src/assembly/shared/init
 src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/script/download
+src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
   mvnw
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.
 src/assembly/shared/validate.cmd
 src/assembly/shared/init.cmd
 src/assembly/shared/mvnwlauncher.cmd
-src/assembly/wrapper/source/download.cmd
+src/assembly/wrapper/shared/download.cmd
 src/assembly/shared/run.cmd
   
   mvnw.cmd
@@ -57,7 +57,7 @@ under the License.
 src/assembly/shared/validate
 src/assembly/shared/init
 src/assembly/shared/mvnwlauncher
-src/assembly/wrapper/source/download
+src/assembly/wrapper/shared/download
 src/assembly/shared/run
   
   mvnw
diff --git a/apache-maven/src/assembly/wrapper/source/download 
b/apache-maven/src/assembly/wrapper/source/download
deleted file mode 100644
index 30cf5e4..000
--- 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

[maven-wrapper-plugin] branch master updated: Update gitignore

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wrapper-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 12f8086  Update gitignore
12f8086 is described below

commit 12f80864a1b02b5857f76ddda24e4d740055b81a
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 19:42:19 2021 +0200

Update gitignore
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 06a84e9..1d02f2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /.classpath
 /.project
 /.settings
+*.iml

[maven-filtering] branch dependabot/maven/org.mockito-mockito-core-4.0.0 created (now fd4f670)

2021-10-13 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/org.mockito-mockito-core-4.0.0
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git.


  at fd4f670  Bump mockito-core from 2.28.2 to 4.0.0

No new revisions were added by this update.

[maven] branch master updated: [MNG-6389] Move the toolchains model to a separate artifactId

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
 new ffc2b99  [MNG-6389] Move the toolchains model to a separate artifactId
ffc2b99 is described below

commit ffc2b99e3eebdeba77fa0fc8ec97a469ae75d148
Author: Giovanni van der Schelde 
AuthorDate: Wed Sep 29 13:44:08 2021 +0200

[MNG-6389] Move the toolchains model to a separate artifactId

Closes #586
---
 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
 29 files changed, 185 insertions(+), 28 deletions(-)

diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 3f9f983..84d2b01 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -130,6 +130,16 @@ under the License.
   
   
 org.apache.maven
+maven-toolchain-model
+${project.version}
+  
+  
+org.apache.maven
+maven-toolchain-builder
+${project.version}
+  
+  
+org.apache.maven
 maven-slf4j-wrapper
 ${project.version}
   
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index dd1b72b..f46fdeb 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -54,6 +54,14 @@ under the License.
 
 
   org.apache.maven
+  maven-toolchain-model
+
+
+  org.apache.maven
+  maven-toolchain-builder
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
@@ -212,12 +220,12 @@ under the License.
 modello-maven-plugin
 
   1.1.0
-  
-src/main/mdo/toolchains.mdo
-  
+  
+  
 
 
   
+
 modello-site-doc
 pre-site
 
diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
index 29f0fc6..f335003 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
@@ -25,13 +25,11 @@ import static 
org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import java.io.InputStream;
 import java.util.Collections;
 
 import org.apache.maven.toolchain.java.DefaultJavaToolChain;
-import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.ToolchainModel;
-import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
@@ -41,8 +39,6 @@ public class DefaultToolchainTest
 {
 private final Logger logger = mock( Logger.class );
 
-private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
-
 @BeforeEach
 public void setUp()
 throws Exception
@@ -129,21 +125,33 @@ public class DefaultToolchainTest
 
 @Test
 public void testEquals()
-throws Exception
 {
-

[maven-assembly-plugin] 01/01: Update to common filters 3.2.0

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch common-filters-320
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git

commit 6ea4fb7e5d3a626a6f1fcabd88dc1c0152eb5296
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 15:55:13 2021 +0200

Update to common filters 3.2.0

And UT fails hard. What is happening here?
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3a8..2728543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@ under the License.
 
   org.apache.maven.shared
   maven-common-artifact-filters
-  3.1.1
+  3.2.0
 
 
   org.apache.maven.shared

[maven-assembly-plugin] branch common-filters-320 created (now 6ea4fb7)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch common-filters-320
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at 6ea4fb7  Update to common filters 3.2.0

This branch includes the following new commits:

 new 6ea4fb7  Update to common filters 3.2.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-antrun-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git

commit b3270a4548340bfe13abd3fe594dee80d75e381a
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 15:43:13 2021 +0200

Update plugin

Set proper maven scopes, update
enforcer.
---
 pom.xml | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0b5ee0..cc24b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
   
 
   
-3.1.1
+3.2.5
 8
 2.22.2
 3.6.1
@@ -74,16 +74,19 @@ under the License.
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven.plugin-tools
@@ -136,11 +139,6 @@ under the License.
 
 
   org.apache.maven.plugins
-  maven-enforcer-plugin
-  3.0.0-M3
-
-
-  org.apache.maven.plugins
   maven-javadoc-plugin
   3.3.1

@@ -162,6 +160,18 @@ under the License.
 
   
 org.apache.maven.plugins
+maven-enforcer-plugin
+3.0.0
+
+  
+org.codehaus.mojo
+extra-enforcer-rules
+1.4
+  
+
+  
+  
+org.apache.maven.plugins
 maven-javadoc-plugin

[maven-antrun-plugin] branch update-plugin created (now b3270a4)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git.


  at b3270a4  Update plugin

This branch includes the following new commits:

 new b3270a4  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-remote-resources-plugin] branch update-plugin created (now bb91d9e)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository 
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git.


  at bb91d9e  Update plugin

This branch includes the following new commits:

 new bb91d9e  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-remote-resources-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository 
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git

commit bb91d9ebab43c05ad339d5183112e47992e9448e
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 15:36:37 2021 +0200

Update plugin

Set proper scopes for maven bits, and
mindor dependency updates.
---
 pom.xml | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a35ef2..970d655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,6 @@ under the License.
   
 3.2.5
 7
-3.1.1
 3.3
 
2020-04-07T21:04:00Z
   
@@ -81,21 +80,25 @@ under the License.
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-model
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
 
@@ -123,7 +126,7 @@ under the License.
 
   org.apache.maven.shared
   maven-filtering
-  ${mavenFilteringVersion}
+  3.2.0
 
 
 
@@ -137,7 +140,7 @@ under the License.
 
   commons-io
   commons-io
-  2.5
+  2.6
 
 
   org.apache.velocity
@@ -149,13 +152,13 @@ under the License.
 
   junit
   junit
-  4.13.1
+  4.13.2
   test
 
 
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
-  3.1.0
+  3.3.0
   test

[maven-assembly-plugin] branch update-plugin updated (84a5ffe -> 8f883d3)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


from 84a5ffe  Update plugin
 add 8f883d3  Leave explanation why needed

No new revisions were added by this update.

Summary of changes:
 .../plugins/assembly/artifact/DefaultDependencyResolverTest.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

[maven] branch maven-3.8.x updated (b6186e2 -> fb5f3f5)

2021-10-13 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git.


from b6186e2  Remove swap file
 add fb5f3f5  [MNG-7270] Switch to shell alternative to "which"

No new revisions were added by this update.

Summary of changes:
 apache-maven/src/bin/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven] branch master updated (0080e84 -> 8852b87)

2021-10-13 Thread michaelo

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.


from 0080e84  [MNG-7297] Remove redundant type arguments (#581)
 add 8852b87  [MNG-7270] Switch to shell alternative to "which"

No new revisions were added by this update.

Summary of changes:
 apache-maven/src/assembly/shared/init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-assembly-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git

commit 84a5ffe233ceda5de44cd1db478363d04c6a6a1b
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 15:19:58 2021 +0200

Update plugin

Set maven bits to proper scope, get rid of
ancient stuff, drop unused code and fix
test.

Added comments with questions and remarks in
POM.
---
 pom.xml| 62 --
 .../artifact/DefaultDependencyResolverTest.java| 28 +++---
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a8..91959b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@ under the License.
 2.1.0
 3.5.1
 3.2.0
-3.0
+3.2.5
 true
 
RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod
 
2020-04-27T17:26:57Z
@@ -88,52 +88,61 @@ under the License.
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
-
-
-  org.apache.maven
-  maven-compat
-  ${mavenVersion}
-  test
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-model
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-settings
   ${mavenVersion}
+  provided
 
 
   org.apache.maven.shared
   maven-shared-utils
-  3.3.3
+  3.3.4
 
+
 
   org.apache.maven
   maven-aether-provider
-  3.0
+  ${mavenVersion}
+  test
 
-
-  org.sonatype.sisu
-  sisu-inject-plexus
-  1.4.2
+ 
+  org.apache.maven
+  maven-compat
+  ${mavenVersion}
+  test
 
+
 
   org.apache.maven.shared
   maven-common-artifact-filters
-  3.1.1
+  3.1.1 
+  
+
+  org.sonatype.sisu
+  sisu-inject-plexus
+
+  
 
 
   org.apache.maven.shared
@@ -150,6 +159,7 @@ under the License.
 
   org.apache.maven.plugin-tools
   maven-plugin-annotations
+  provided
 
 
   org.codehaus.plexus
@@ -159,7 +169,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  4.2.1
+  4.2.5
 
 
 
@@ -191,7 +201,7 @@ under the License.
 
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
-  2.1
+  3.3.0
   test
 
 
@@ -231,6 +241,26 @@ under the License.
   plexus-component-annotations
   provided
 
+
+ 
+  org.eclipse.sisu
+  org.eclipse.sisu.plexus
+  0.3.5
+  compile
+
+
+  org.sonatype.sisu
+  sisu-guice
+  3.2.6
+  no_aop
+  test
+
+
+  org.slf4j
+  slf4j-simple
+  1.7.32
+  test
+
   
 
   
diff --git 
a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
 
b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
index 66e8ecb..da6acf6 100644
--- 
a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
+++ 
b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
@@ -32,21 +32,15 @@ import java.util.Set;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
 import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugins.assembly.model.DependencySet;
 import org.apache.maven.plugins.assembly.model.ModuleBinaries;
 import org.apache.maven.plugins.assembly.model.ModuleSet;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusTestCase;
 
 public class DefaultDependencyResolverTest
@@ -63,23 +57,13 @@ public class DefaultDependencyResolverTest
 
 resolver = (DefaultDependencyResolver) lookup( 
DependencyResolver.class );
 }
-
-

[maven-assembly-plugin] branch update-plugin created (now 84a5ffe)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at 84a5ffe  Update plugin

This branch includes the following new commits:

 new 84a5ffe  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-rar-plugin] branch update-plugin created (now b893523)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git.


  at b893523  Update plugin

This branch includes the following new commits:

 new b893523  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-rar-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git

commit b893523e741c45c54d13db81d099b4a4ff09f895
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 13:17:46 2021 +0200

Update plugin

Set proper scopes for maven bits, update
dependencies and up test harness.
---
 pom.xml | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61711e2..7afd4ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 maven-plugins
 org.apache.maven.plugins
 34
-../../pom/maven/maven-plugins/pom.xml
+
   
 
   maven-rar-plugin
@@ -72,7 +72,7 @@ under the License.
   
   
   
-3.0
+3.2.5
 7
 
2020-04-07T21:04:00Z
 
@@ -82,16 +82,19 @@ under the License.
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven.plugin-tools
@@ -101,7 +104,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.25
+  1.26
 
 
   org.codehaus.plexus
@@ -111,7 +114,7 @@ under the License.
 
   org.apache.maven.shared
   maven-shared-utils
-  3.3.3
+  3.3.4
 
 
   org.apache.maven.shared
@@ -143,7 +146,7 @@ under the License.
 
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
-  2.1
+  3.3.0
   test

[maven-ejb-plugin] branch update-plugin created (now 1acfd99)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git.


  at 1acfd99  Update plugin

This branch includes the following new commits:

 new 1acfd99  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-ejb-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git

commit 1acfd9921f0e9cd973c7545f8ad525c9d626aa67
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 13:11:30 2021 +0200

Update plugin

Set proper scopes for maven bits
and update dependencies.
---
 pom.xml | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9132a9..40ff07b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
 org.apache.maven.plugins
 maven-plugins
 34
-../../pom/maven/maven-plugins/pom.xml
+
   
 
   maven-ejb-plugin
@@ -62,9 +62,9 @@ under the License.
   
 
   
-3.5.0
-3.1.1
-3.1.1
+3.5.1
+3.2.0
+3.2.5
 7
 
2020-06-07T16:20:17Z
   
@@ -74,16 +74,19 @@ under the License.
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
@@ -108,7 +111,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-archiver
-  4.2.3
+  4.2.5
 
 
   org.codehaus.plexus
@@ -123,7 +126,7 @@ under the License.
 
   junit
   junit
-  4.13.1
+  4.13.2
   test
 
 
@@ -135,7 +138,7 @@ under the License.
 
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
-  3.0.0
+  3.3.0
   test

[maven-ear-plugin] branch update-plugin updated (49b66ed -> 06876a8)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.


from 49b66ed  Update plugin
 add 06876a8  Must directly override plugin from parent

No new revisions were added by this update.

Summary of changes:
 pom.xml | 5 -
 1 file changed, 5 deletions(-)

[maven-ear-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit 49b66ed11a1b2e3aa8c1ac76b48565affa144068
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 12:50:55 2021 +0200

Update plugin

Set maven bits to proper scope, update
deps and fix parent enforcer that still
want to use maven2 bits
---
 pom.xml | 23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0234a3f..75b2406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,16 +105,19 @@
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
@@ -129,7 +132,7 @@
 
   org.codehaus.plexus
   plexus-archiver
-  4.2.4
+  4.2.5
 
 
   org.codehaus.plexus
@@ -159,7 +162,7 @@
 
   org.apache.maven.shared
   maven-shared-utils
-  3.3.3
+  3.3.4
 
 
 
@@ -257,12 +260,12 @@
 
   org.apache.maven.plugins
   maven-project-info-reports-plugin
-  3.1.1
+  3.1.2
 
 
   org.apache.maven.plugins
   maven-enforcer-plugin
-  3.0.0-M3
+  3.0.0
 
 
   org.apache.maven.plugins
@@ -274,6 +277,18 @@
 
   
 org.apache.maven.plugins
+maven-enforcer-plugin
+3.0.0
+
+  
+org.codehaus.mojo
+extra-enforcer-rules
+1.4
+  
+
+  
+  
+org.apache.maven.plugins
 maven-resources-plugin
 
   \

[maven-ear-plugin] branch update-plugin created (now 49b66ed)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.


  at 49b66ed  Update plugin

This branch includes the following new commits:

 new 49b66ed  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven] 02/03: [MNG-6389] Remove files that were supposed to be moved

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 3c818a200f22c89f0704424bf0d8894cd2ed5613
Author: Maarten Mulders 
AuthorDate: Wed Oct 13 11:53:37 2021 +0200

[MNG-6389] Remove files that were supposed to be moved
---
 .../building/DefaultToolchainsBuilderTest.java | 283 -
 .../building/ToolchainsBuildingExceptionTest.java  |  73 --
 .../toolchain/merge/MavenToolchainMergerTest.java  | 135 --
 .../org/apache/maven/toolchain/global.xml  |  35 ---
 .../toolchain/model/toolchains-jdks-extend.xml |  45 
 .../toolchain/model/toolchains-jdks-extra.xml  |  45 
 .../maven/toolchain/model/toolchains-jdks.xml  |  43 
 .../resources/org/apache/maven/toolchain/user.xml  |  35 ---
 8 files changed, 694 deletions(-)

diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
 
b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
deleted file mode 100644
index 94c15b8..000
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package org.apache.maven.toolchain.building;
-
-/*
- * 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.
- */
-
-import org.apache.maven.building.StringSource;
-import org.apache.maven.toolchain.io.DefaultToolchainsReader;
-import org.apache.maven.toolchain.io.DefaultToolchainsWriter;
-import org.apache.maven.toolchain.io.ToolchainsParseException;
-import org.apache.maven.toolchain.model.PersistedToolchains;
-import org.apache.maven.toolchain.model.ToolchainModel;
-import org.codehaus.plexus.interpolation.os.OperatingSystemUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.BeforeEach;
-import org.mockito.ArgumentMatchers;
-import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-
-public class DefaultToolchainsBuilderTest
-{
-private static final String LS = System.lineSeparator();
-
-@Spy
-private DefaultToolchainsReader toolchainsReader;
-
-@Spy
-private DefaultToolchainsWriter toolchainsWriter;
-
-@InjectMocks
-private DefaultToolchainsBuilder toolchainBuilder;
-
-@BeforeEach
-public void onSetup()
-{
-MockitoAnnotations.initMocks( this );
-
-Map envVarMap = new HashMap<>();
-envVarMap.put("testKey", "testValue");
-envVarMap.put("testSpecialCharactersKey", "");
-OperatingSystemUtils.setEnvVarSource(new TestEnvVarSource(envVarMap));
-}
-
-@Test
-public void testBuildEmptyRequest()
-throws Exception
-{
-ToolchainsBuildingRequest request = new 
DefaultToolchainsBuildingRequest();
-ToolchainsBuildingResult result = toolchainBuilder.build( request );
-assertNotNull( result.getEffectiveToolchains() );
-assertNotNull( result.getProblems() );
-assertEquals( 0, result.getProblems().size() );
-}
-
-@Test
-public void testBuildRequestWithUserToolchains()
-throws Exception
-{
-ToolchainsBuildingRequest request = new 
DefaultToolchainsBuildingRequest();
-request.setUserToolchainsSource( new StringSource( "" ) );
-
-PersistedToolchains userResult = new PersistedToolchains();
-ToolchainModel toolchain = new ToolchainModel();
-toolchain.setType( "TYPE" );
-toolchain.addProvide( "key", "user_value" );
-userResult.addToolchain(  toolchain );
-doReturn(userResult).when( toolchainsReader ).read( any( 
InputStream.class ), ArgumentMatchers.anyMap());

[maven] branch MNG-6389-introduce-seperate-toolchain-artifact updated (78de56c -> b4a753a)

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a change to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 78de56c  [MNG-6389] Resolve PR feedback
 discard 9502e10  [MNG-6389] Remove files that were supposed to be moved
 new c26cfce  [MNG-6389] Isolate test from model reading code
 new 3c818a2  [MNG-6389] Remove files that were supposed to be moved
 new b4a753a  [MNG-6389] Resolve PR feedback

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   (78de56c)
\
 N -- N -- N   
refs/heads/MNG-6389-introduce-seperate-toolchain-artifact (b4a753a)

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 3 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:
 .../maven/toolchain/DefaultToolchainTest.java  |  48 ++--
 .../building/DefaultToolchainsBuilderTest.java | 283 -
 .../building/ToolchainsBuildingExceptionTest.java  |  73 --
 .../org/apache/maven/toolchain/global.xml  |  35 ---
 .../toolchain/model/toolchains-jdks-extra.xml  |  45 
 .../maven/toolchain/model/toolchains-jdks.xml  |  43 
 .../resources/org/apache/maven/toolchain/user.xml  |  35 ---
 .../toolchain/merge/MavenToolchainMerger.java  |   2 +-
 8 files changed, 29 insertions(+), 535 deletions(-)
 delete mode 100644 
maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
 delete mode 100644 
maven-core/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
 delete mode 100644 
maven-core/src/test/resources/org/apache/maven/toolchain/global.xml
 delete mode 100644 
maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
 delete mode 100644 
maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
 delete mode 100644 
maven-core/src/test/resources/org/apache/maven/toolchain/user.xml

[maven] 03/03: [MNG-6389] Resolve PR feedback

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit b4a753aaa9f51dd99d05198b6bcf9f10bcdf0575
Author: Giovanni van der Schelde 
AuthorDate: Wed Oct 13 12:11:09 2021 +0200

[MNG-6389] Resolve PR feedback
---
 maven-core/pom.xml|  2 ++
 .../building/DefaultToolchainsBuildingResult.java |  6 +++---
 .../toolchain/building/ToolchainsBuildingException.java   |  4 ++--
 .../toolchain/building/ToolchainsBuildingResult.java  |  4 ++--
 .../maven/toolchain/io/DefaultToolchainsReader.java   | 15 ---
 .../org/apache/maven/toolchain/io/ToolchainsReader.java   |  4 ++--
 .../maven/toolchain/merge/MavenToolchainMerger.java   | 10 +-
 7 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9e12f98..f46fdeb 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -220,10 +220,12 @@ under the License.
 modello-maven-plugin
 
   1.1.0
+  
   
 
 
   
+
 modello-site-doc
 pre-site
 
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
index fd96162..2d07a4a 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
@@ -19,12 +19,12 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
-import org.apache.maven.building.Problem;
-import org.apache.maven.toolchain.model.PersistedToolchains;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.building.Problem;
+import org.apache.maven.toolchain.model.PersistedToolchains;
+
 /**
  * Holds the result of the merged toolchains and holds the problems during 
this build, if any.
  *
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
index dce9e5c..ccd354b 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
@@ -19,13 +19,13 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
-import org.apache.maven.building.Problem;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.building.Problem;
+
 /**
  * @author Robert Scholte
  * @since 3.3.0
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
index 4ec3ee6..f7c5f71 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
@@ -19,11 +19,11 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
+import java.util.List;
+
 import org.apache.maven.building.Problem;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 
-import java.util.List;
-
 /**
  * Collects the output of the toolchains builder.
  *
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 4d766a1..2522551 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -19,13 +19,6 @@ package org.apache.maven.toolchain.io;
  * under the License.
  */
 
-import org.apache.maven.toolchain.model.PersistedToolchains;
-import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,6 +26,14 @@ import java.io.Reader;
 import java.util.Map;
 import java.util.Objects;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+

[maven] 01/03: [MNG-6389] Isolate test from model reading code

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit c26cfcedc3b7fdacd33bb4435d592a4feb0bfdc5
Author: Maarten Mulders 
AuthorDate: Wed Oct 13 12:30:42 2021 +0200

[MNG-6389] Isolate test from model reading code
---
 .../maven/toolchain/DefaultToolchainTest.java  | 48 +-
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
index 29f0fc6..f335003 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
@@ -25,13 +25,11 @@ import static 
org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import java.io.InputStream;
 import java.util.Collections;
 
 import org.apache.maven.toolchain.java.DefaultJavaToolChain;
-import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.ToolchainModel;
-import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
@@ -41,8 +39,6 @@ public class DefaultToolchainTest
 {
 private final Logger logger = mock( Logger.class );
 
-private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
-
 @BeforeEach
 public void setUp()
 throws Exception
@@ -129,21 +125,33 @@ public class DefaultToolchainTest
 
 @Test
 public void testEquals()
-throws Exception
 {
-try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( 
"toolchains-jdks.xml" );
-  InputStream jdksExtraIS = 
ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) )
-{
-PersistedToolchains jdks = reader.read( jdksIS );
-PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
-
-DefaultToolchain tc1 = new DefaultJavaToolChain( 
jdks.getToolchains().get( 0 ), null );
-DefaultToolchain tc2 = new DefaultJavaToolChain( 
jdksExtra.getToolchains().get( 0 ), null );
-
-assertEquals( tc1, tc1 );
-assertNotEquals( tc1, tc2 );
-assertNotEquals( tc2, tc1 );
-assertEquals( tc2, tc2 );
-}
+ToolchainModel tm1 = new ToolchainModel();
+tm1.setType( "jdk" );
+tm1.addProvide( "version", "1.5" );
+tm1.addProvide( "vendor", "sun" );
+Xpp3Dom configuration1 = new Xpp3Dom("configuration");
+Xpp3Dom jdkHome1 = new Xpp3Dom( "jdkHome" );
+jdkHome1.setValue("${env.JAVA_HOME}");
+configuration1.addChild( jdkHome1 );
+tm1.setConfiguration( configuration1 );
+
+ToolchainModel tm2 = new ToolchainModel();
+tm1.setType( "jdk" );
+tm1.addProvide( "version", "1.4" );
+tm1.addProvide( "vendor", "sun" );
+Xpp3Dom configuration2 = new Xpp3Dom("configuration");
+Xpp3Dom jdkHome2 = new Xpp3Dom( "jdkHome" );
+jdkHome2.setValue("${env.JAVA_HOME}");
+configuration2.addChild( jdkHome2 );
+tm2.setConfiguration( configuration2 );
+
+DefaultToolchain tc1 = new DefaultJavaToolChain( tm1, null );
+DefaultToolchain tc2 = new DefaultJavaToolChain( tm2, null );
+
+assertEquals( tc1, tc1 );
+assertNotEquals( tc1, tc2 );
+assertNotEquals( tc2, tc1 );
+assertEquals( tc2, tc2 );
 }
 }

[maven-compiler-plugin] 01/01: Update plugin

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit 751437ae844a64b47c110fb8ab3982a5638f506e
Author: Tamas Cservenak 
AuthorDate: Wed Oct 13 12:29:25 2021 +0200

Update plugin

Set proper scopes for maven deps, drop cruft not
needed since eons. We do not test against maven 3.0
or maven 2 anymore, so upped testing harness (was 2.x!)
and hence, upped maven version as well (was still using
org.sonatype.aether).
---
 pom.xml | 36 ++--
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33a5108..267e365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
   
 
   
-3.0
+3.2.5
 
@@ -84,16 +84,6 @@ under the License.
 
   
 
-  
-
-  
-
-com.thoughtworks.qdox
-qdox
-2.0.0
-  
-
-  
   
 
   org.apache.maven.plugin-tools
@@ -105,17 +95,21 @@ under the License.
   org.apache.maven
   maven-plugin-api
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-artifact
   ${mavenVersion}
+  provided
 
 
   org.apache.maven
   maven-core
   ${mavenVersion}
+  provided
 
+
 
   org.apache.maven.shared
   maven-shared-utils
@@ -137,41 +131,23 @@ under the License.
   org.codehaus.plexus
   plexus-compiler-api
   ${plexusCompilerVersion}
-  
-
-  org.codehaus.plexus
-  plexus-component-api
-
-  
 
 
   org.codehaus.plexus
   plexus-compiler-manager
   ${plexusCompilerVersion}
-  
-
-  org.codehaus.plexus
-  plexus-component-api
-
-  
 
 
   org.codehaus.plexus
   plexus-compiler-javac
   ${plexusCompilerVersion}
   runtime
-  
-
-  org.codehaus.plexus
-  plexus-component-api
-
-  
 
 
 
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
-  2.1
+  3.3.0
   test

[maven-compiler-plugin] branch update-plugin created (now 751437a)

2021-10-13 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git.


  at 751437a  Update plugin

This branch includes the following new commits:

 new 751437a  Update plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven] 02/05: [MNG-6389] Seperate module for toolchain builder

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 3823303b12c5e4a723268573553d7b70766fa4c8
Author: Giovanni van der Schelde 
AuthorDate: Wed Oct 13 09:10:52 2021 +0200

[MNG-6389] Seperate module for toolchain builder
---
 maven-bom/pom.xml  |   5 +
 maven-core/pom.xml |   4 +
 .../pom.xml|  34 ++-
 .../building/DefaultToolchainsBuilder.java |   0
 .../building/DefaultToolchainsBuildingRequest.java |   0
 .../building/DefaultToolchainsBuildingResult.java  |   6 +-
 .../toolchain/building/ToolchainsBuilder.java  |   0
 .../building/ToolchainsBuildingException.java  |   4 +-
 .../building/ToolchainsBuildingRequest.java|   0
 .../building/ToolchainsBuildingResult.java |   4 +-
 .../toolchain/io/DefaultToolchainsReader.java  |  15 +-
 .../toolchain/io/DefaultToolchainsWriter.java  |   0
 .../toolchain/io/ToolchainsParseException.java |   0
 .../maven/toolchain/io/ToolchainsReader.java   |   4 +-
 .../maven/toolchain/io/ToolchainsWriter.java   |   0
 .../toolchain/merge/MavenToolchainMerger.java  |  10 +-
 .../building/DefaultToolchainsBuilderTest.java | 283 +
 .../building/ToolchainsBuildingExceptionTest.java  |  73 ++
 .../toolchain/merge/MavenToolchainMergerTest.java  | 135 ++
 .../org/apache/maven/toolchain/global.xml  |  35 +++
 .../toolchain/model/toolchains-jdks-extend.xml |  45 
 .../toolchain/model/toolchains-jdks-extra.xml  |  45 
 .../maven/toolchain/model/toolchains-jdks.xml  |  43 
 .../resources/org/apache/maven/toolchain/user.xml  |  35 +++
 maven-toolchain-model/pom.xml  |   3 +
 pom.xml|   1 +
 26 files changed, 752 insertions(+), 32 deletions(-)

diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 4385302..84d2b01 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -135,6 +135,11 @@ under the License.
   
   
 org.apache.maven
+maven-toolchain-builder
+${project.version}
+  
+  
+org.apache.maven
 maven-slf4j-wrapper
 ${project.version}
   
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index cf9ea01..9e12f98 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -58,6 +58,10 @@ under the License.
 
 
   org.apache.maven
+  maven-toolchain-builder
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-builder/pom.xml
similarity index 61%
copy from maven-toolchain-model/pom.xml
copy to maven-toolchain-builder/pom.xml
index e824643..5dcbea2 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-builder/pom.xml
@@ -29,26 +29,40 @@ under the License.
 
 4.0.0
 
-maven-toolchain-model
+maven-toolchain-builder
+
+Maven Toolchain Builder
+The effective toolchain builder.
 
 
 
+org.apache.maven
+maven-toolchain-model
+
+
+org.apache.maven
+maven-builder-support
+
+
+javax.inject
+javax.inject
+
+
 org.codehaus.plexus
-plexus-utils
+plexus-interpolation
+
+
+org.mockito
+mockito-core
+test
 
 
 
 
 
 
-org.codehaus.modello
-modello-maven-plugin
-
-1.1.0
-
-src/main/mdo/toolchains.mdo
-
-
+org.eclipse.sisu
+sisu-maven-plugin
 
 
 
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
similarity index 100%
rename from 
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
rename to 
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
similarity index 100%
rename from 
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
rename to 
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
diff --git

[maven] 04/05: [MNG-6389] Remove files that were supposed to be moved

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 9502e1099eee0c7ab6ff36f4b4e82418b8c7137a
Author: Maarten Mulders 
AuthorDate: Wed Oct 13 11:53:37 2021 +0200

[MNG-6389] Remove files that were supposed to be moved
---
 .../toolchain/merge/MavenToolchainMergerTest.java  | 135 -
 .../toolchain/model/toolchains-jdks-extend.xml |  45 ---
 2 files changed, 180 deletions(-)

diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
 
b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
deleted file mode 100644
index 7bed9a9..000
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.apache.maven.toolchain.merge;
-
-/*
- * 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.
- */
-
-import org.apache.maven.toolchain.model.PersistedToolchains;
-import org.apache.maven.toolchain.model.ToolchainModel;
-import org.apache.maven.toolchain.model.TrackableBase;
-import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.junit.jupiter.api.Test;
-
-import java.io.InputStream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MavenToolchainMergerTest
-{
-private MavenToolchainMerger merger = new MavenToolchainMerger();
-
-private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
-
-@Test
-public void testMergeNulls()
-{
-merger.merge( null, null, null );
-
-PersistedToolchains pt = new PersistedToolchains();
-merger.merge( pt, null, null );
-merger.merge( null, pt, null );
-}
-
-@Test
-public void testMergeJdk()
-throws Exception
-{
-try ( InputStream isDominant = 
ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" );
-  InputStream isRecessive = 
ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ) )
-{
-PersistedToolchains dominant = reader.read( isDominant );
-PersistedToolchains recessive = reader.read( isRecessive );
-assertEquals( 2, dominant.getToolchains().size() );
-
-merger.merge( dominant, recessive, TrackableBase.USER_LEVEL );
-assertEquals( 2, dominant.getToolchains().size() );
-}
-}
-
-@Test
-public void testMergeJdkExtra()
-throws Exception
-{
-try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( 
"toolchains-jdks.xml" );
-  InputStream jdksExtraIS = 
ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) )
-{
-PersistedToolchains jdks = reader.read( jdksIS );
-PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
-assertEquals( 2, jdks.getToolchains().size() );
-
-merger.merge( jdks, jdksExtra, TrackableBase.USER_LEVEL );
-assertEquals( 4, jdks.getToolchains().size() );
-assertEquals( 2, jdksExtra.getToolchains().size() );
-}
-try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( 
"toolchains-jdks.xml" );
-  InputStream jdksExtraIS = 
ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ) )
-{
-PersistedToolchains jdks = reader.read( jdksIS );
-PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
-assertEquals( 2, jdks.getToolchains().size() );
-
-// switch dominant with recessive
-merger.merge( jdksExtra, jdks, TrackableBase.USER_LEVEL );
-assertEquals( 4, jdksExtra.getToolchains().size() );
-assertEquals( 2, jdks.getToolchains().size() );
-}
-}
-
-@Test
-public void testMergeJdkExtend()
-throws Exception
-{
-try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( 
"toolchains-jdks.xml" );
-

[maven] 01/05: [MNG-6389] Move toolchain model to seperate module

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 049a72ccfe22a3187cf0553d75117a1e383625cd
Author: Giovanni van der Schelde 
AuthorDate: Wed Sep 29 13:44:08 2021 +0200

[MNG-6389] Move toolchain model to seperate module
---
 maven-bom/pom.xml  |  5 ++
 maven-core/pom.xml |  8 ++--
 maven-toolchain-model/pom.xml  | 56 ++
 .../src/main/mdo/toolchains.mdo|  0
 pom.xml|  1 +
 5 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 3f9f983..4385302 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -130,6 +130,11 @@ under the License.
   
   
 org.apache.maven
+maven-toolchain-model
+${project.version}
+  
+  
+org.apache.maven
 maven-slf4j-wrapper
 ${project.version}
   
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index dd1b72b..cf9ea01 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -54,6 +54,10 @@ under the License.
 
 
   org.apache.maven
+  maven-toolchain-model
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
@@ -212,9 +216,7 @@ under the License.
 modello-maven-plugin
 
   1.1.0
-  
-src/main/mdo/toolchains.mdo
-  
+  
 
 
   
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
new file mode 100644
index 000..e824643
--- /dev/null
+++ b/maven-toolchain-model/pom.xml
@@ -0,0 +1,56 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+maven
+org.apache.maven
+4.0.0-alpha-1-SNAPSHOT
+
+4.0.0
+
+maven-toolchain-model
+
+
+
+org.codehaus.plexus
+plexus-utils
+
+
+
+
+
+
+org.codehaus.modello
+modello-maven-plugin
+
+1.1.0
+
+src/main/mdo/toolchains.mdo
+
+
+
+
+
+
+
diff --git a/maven-core/src/main/mdo/toolchains.mdo 
b/maven-toolchain-model/src/main/mdo/toolchains.mdo
similarity index 100%
rename from maven-core/src/main/mdo/toolchains.mdo
rename to maven-toolchain-model/src/main/mdo/toolchains.mdo
diff --git a/pom.xml b/pom.xml
index 49875c5..2a516c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,7 @@ under the License.
 apache-maven 
 maven-wrapper
 apache-maven/maven-wrapper.pom
+maven-toolchain-model

[maven] 05/05: [MNG-6389] Resolve PR feedback

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 78de56cad43914cc86f88c06516210988ea7bd0f
Author: Giovanni van der Schelde 
AuthorDate: Wed Oct 13 12:11:09 2021 +0200

[MNG-6389] Resolve PR feedback
---
 maven-core/pom.xml|  2 ++
 .../building/DefaultToolchainsBuildingResult.java |  6 +++---
 .../toolchain/building/ToolchainsBuildingException.java   |  4 ++--
 .../toolchain/building/ToolchainsBuildingResult.java  |  4 ++--
 .../maven/toolchain/io/DefaultToolchainsReader.java   | 15 ---
 .../org/apache/maven/toolchain/io/ToolchainsReader.java   |  4 ++--
 .../maven/toolchain/merge/MavenToolchainMerger.java   |  8 
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9e12f98..f46fdeb 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -220,10 +220,12 @@ under the License.
 modello-maven-plugin
 
   1.1.0
+  
   
 
 
   
+
 modello-site-doc
 pre-site
 
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
index fd96162..2d07a4a 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
@@ -19,12 +19,12 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
-import org.apache.maven.building.Problem;
-import org.apache.maven.toolchain.model.PersistedToolchains;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.building.Problem;
+import org.apache.maven.toolchain.model.PersistedToolchains;
+
 /**
  * Holds the result of the merged toolchains and holds the problems during 
this build, if any.
  *
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
index dce9e5c..ccd354b 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
@@ -19,13 +19,13 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
-import org.apache.maven.building.Problem;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.building.Problem;
+
 /**
  * @author Robert Scholte
  * @since 3.3.0
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
index 4ec3ee6..f7c5f71 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
@@ -19,11 +19,11 @@ package org.apache.maven.toolchain.building;
  * under the License.
  */
 
+import java.util.List;
+
 import org.apache.maven.building.Problem;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 
-import java.util.List;
-
 /**
  * Collects the output of the toolchains builder.
  *
diff --git 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 4d766a1..2522551 100644
--- 
a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -19,13 +19,6 @@ package org.apache.maven.toolchain.io;
  * under the License.
  */
 
-import org.apache.maven.toolchain.model.PersistedToolchains;
-import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,6 +26,14 @@ import java.io.Reader;
 import java.util.Map;
 import java.util.Objects;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+

[maven] branch MNG-6389-introduce-seperate-toolchain-artifact updated (1099ca2 -> 78de56c)

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a change to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 1099ca2  [MNG-6389] Update dependency/module graph
 discard 744d0a1  [MNG-6389] Seperate module for toolchain builder
 discard 64fdaaa  [MNG-6389] Move toolchain model to seperate module
 add e29a661  [MNG-7185] Describe explicit and recommended version for 
VersionRange.createFromVersionSpec()
 add e8b9cad  Wrap line in consistency with Command script
 add e9a54c6  Use proper term: directory
 add 94df4a8  Apply consistent formatting
 add 8712063  [MNG-7190] Load mavenrc from /usr/local/etc also in Bourne 
shell script
 add 2321e03  [MNG-7190] add /usr/local/etc/mavenrc to reference 
documentation
 add f582ce8  [MNG-7047] Validate that repo configuration does not contain 
any expression
 add 0696cf1  [MNG-7131] maven.config doesn't handle arguments with spaces 
in them
 add b8cdac5  [MNG-7189] Remove undocumented environment variable 
MAVEN_BASEDIR in startup scripts
 add 6b37fcb  [MNG-7191] Remove undocumented environment variable 
MAVEN_CONFIG in startup scripts
 add 1328d6e  [MNG-7192] Remove unsed MAVEN_CMD_LINE_ARGS environment 
variable in startup scripts
 add a2f8106  [MNG-6656] Features must use userProperties instead of 
systemProperties
 add f7a775b  [MNG-6648] 'mavenrc_pre' script does not receive arguments 
like mavenrc in Bourne shell does
 add a2ab329  Warn also on Windows when JAVA_HOME isn't set
 add 9c69c78  remove unused property
 add 5fa834f  [MNG-7010] Omit "NB: JAVA_HOME should point to a JDK not a 
JRE"
 add 021e53f  [MNG-7196] Upgrade Jansi to 2.3.4
 add 6c67c9d  [MNG-7197] Simplify exit code handling in Windows command 
startup script
 add a21be1d  [MNG-7195] Rework JAVA_HOME handling
 add 52c12da  [MNG-7195] Rework JAVA_HOME handling
 add 06bc508  [MNG-7198] Upgrade SLF4J to 1.7.32
 add 43eb189  [chore] Update CI environment
 add ef62d7a  Merge pull request #516 from aheritier/ci-maven
 add 750cb6c  [MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script 
improperly handles two options at once
 add a2a3df3  [MNG-7203] Introduce a long option --verbose and deprecate 
--debug
 add 5acdfb6  [MNG-7205] Simplify/unify Cygwin/MingGW handling in startup 
scripts
 add 0137f35  Document Maven 3.8.2 release
 add f594c0b  Add ModelSource test for MNG-5669
 add 48a9e04  [MNG-7209] Introduce a user mavenrc.cmd in Windows command 
script
 add 0682a1c  [MNG-7208] Introduce a system-wide mavenrc.cmd in Windows 
command script
 add b20bfb1  [MNG-7208] Document system-wide mavenrc.cmd in Windows 
command script
 add 92d2c2e  [MNG-7209] Document user mavenrc.cmd in Windows command script
 add 76d7f58  [MNG-7226] DefaultModelBuilder.buildRawModel fails (#528)
 add 067171d  [MNG-7246] Upgrade Plexus Cipher and Sec Dispatcher to 2.0
 add aa30d96  [MNG-7247] Upgrade Maven Resolver to 1.7.2
 add 406c525  [MNG-7250] Upgrade Sisu Inject/Plexus to 0.3.5
 add a6e462b  [MNG-7251] Fix threadLocalArtifactsHolder leaking into cloned 
project
 add 6b6589b  [MNG-7219] [Regression] plexus-cipher missing from transitive 
dependencies
 add 23ffe33  [MNG-7236] The DefaultPluginVersionResolver should cache 
results for the session
 add 8c297e9  [MNG-7254] Expand Windows native libraries for Jansi due to 
JDK-8195129 (workaround)
 add a1ba330  [MNG-7253] Display relocation message defined in model
 add f50de4c  [MNG-7210] Deprecate mavenrc_{pre,post}.{bat,cmd} scripts
 add 5fd5368  [MNG-7248] Fix warnings issued by dependency:analyze
 add ad2e084  [MNG-7164] Add constructor MojoExecutionException(Throwable)
 add 9735fff  added an "ignore" option for checksumPolicy in documents
 add 9539227  set "fail" as a default option for checksumPolicy in documents
 add 98b69be  deleted duplication in checksum description
 add b718287  Default value of checksumPolicy depends on the Maven version
 add 2926f03  [MNG-7265] Convert maven-core artifact-handlers.xml to 
Providers
 add 4cb8909  Convert maven-core components XML to Providers
 add c647dbc  Get rid of guava
 add 9f348e9  PlexusCipher should be injected
 add 6c34313  Merge pull request #549 from apache/drop-components-xml
 add 6c7d105  [MNG-7264] Convert maven-core default-bindings to Providers 
(#550)
 add c8d5ba3  [MNG-7235] Speed improvements when calculating the sorted 
project graph
 add 25cf157  [MNG-7271] - Code Improvement
 add 038201e  [MNG-7274] - JUnit Jupiter via BOM
 add 5c9512f  [MNG-7275] - fixing resource leak due to Files.list
 add edbf133  [MNG-7277] - Remove useless Test - 
testNonNumericVersionRepresentationReturnsANumberFormatException
 add e30c1bf  Add a unit test for

[maven] 03/05: [MNG-6389] Update dependency/module graph

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 63b622fdcac01894ffe0da1323773b2f756c0a36
Author: Maarten Mulders 
AuthorDate: Wed Sep 29 14:48:03 2021 +0200

[MNG-6389] Update dependency/module graph
---
 src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 9255b01..8f7f977 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg 
differ

[maven] 01/03: [MNG-6389] Move toolchain model to seperate module

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 64fdaaade74514aa2ea7a9d0e7883396732b168b
Author: Giovanni van der Schelde 
AuthorDate: Wed Sep 29 13:44:08 2021 +0200

[MNG-6389] Move toolchain model to seperate module
---
 maven-bom/pom.xml  |  5 ++
 maven-core/pom.xml |  8 ++--
 maven-toolchain-model/pom.xml  | 56 ++
 .../src/main/mdo/toolchains.mdo|  0
 pom.xml|  1 +
 5 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 097fadf..2395531 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -130,6 +130,11 @@ under the License.
   
   
 org.apache.maven
+maven-toolchain-model
+${project.version}
+  
+  
+org.apache.maven
 maven-slf4j-wrapper
 ${project.version}
   
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 89450f9..e91263a 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -54,6 +54,10 @@ under the License.
 
 
   org.apache.maven
+  maven-toolchain-model
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
@@ -213,9 +217,7 @@ under the License.
 modello-maven-plugin
 
   1.1.0
-  
-src/main/mdo/toolchains.mdo
-  
+  
 
 
   
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
new file mode 100644
index 000..e824643
--- /dev/null
+++ b/maven-toolchain-model/pom.xml
@@ -0,0 +1,56 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+maven
+org.apache.maven
+4.0.0-alpha-1-SNAPSHOT
+
+4.0.0
+
+maven-toolchain-model
+
+
+
+org.codehaus.plexus
+plexus-utils
+
+
+
+
+
+
+org.codehaus.modello
+modello-maven-plugin
+
+1.1.0
+
+src/main/mdo/toolchains.mdo
+
+
+
+
+
+
+
diff --git a/maven-core/src/main/mdo/toolchains.mdo 
b/maven-toolchain-model/src/main/mdo/toolchains.mdo
similarity index 100%
rename from maven-core/src/main/mdo/toolchains.mdo
rename to maven-toolchain-model/src/main/mdo/toolchains.mdo
diff --git a/pom.xml b/pom.xml
index 47586fd..818d70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@ under the License.
 apache-maven 
 maven-wrapper
 apache-maven/maven-wrapper.pom
+maven-toolchain-model

[maven] 03/03: [MNG-6389] Update dependency/module graph

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 1099ca200ac23dbff2101eaa1b61f078f2e013de
Author: Maarten Mulders 
AuthorDate: Wed Sep 29 14:48:03 2021 +0200

[MNG-6389] Update dependency/module graph
---
 src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 9255b01..8f7f977 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg 
differ

[maven] 02/03: [MNG-6389] Seperate module for toolchain builder

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a commit to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 744d0a1216699d646adf0621b89f4f4e6b4b8623
Author: Giovanni van der Schelde 
AuthorDate: Wed Oct 13 09:10:52 2021 +0200

[MNG-6389] Seperate module for toolchain builder
---
 maven-bom/pom.xml  |   5 +
 maven-core/pom.xml |   4 +
 .../pom.xml|  34 ++-
 .../building/DefaultToolchainsBuilder.java |   0
 .../building/DefaultToolchainsBuildingRequest.java |   0
 .../building/DefaultToolchainsBuildingResult.java  |   6 +-
 .../toolchain/building/ToolchainsBuilder.java  |   0
 .../building/ToolchainsBuildingException.java  |   4 +-
 .../building/ToolchainsBuildingRequest.java|   0
 .../building/ToolchainsBuildingResult.java |   4 +-
 .../toolchain/io/DefaultToolchainsReader.java  |  15 +-
 .../toolchain/io/DefaultToolchainsWriter.java  |   0
 .../toolchain/io/ToolchainsParseException.java |   0
 .../maven/toolchain/io/ToolchainsReader.java   |   4 +-
 .../maven/toolchain/io/ToolchainsWriter.java   |   0
 .../toolchain/merge/MavenToolchainMerger.java  |  10 +-
 .../building/DefaultToolchainsBuilderTest.java | 283 +
 .../building/ToolchainsBuildingExceptionTest.java  |  73 ++
 .../toolchain/merge/MavenToolchainMergerTest.java  | 135 ++
 .../org/apache/maven/toolchain/global.xml  |  35 +++
 .../toolchain/model/toolchains-jdks-extend.xml |  45 
 .../toolchain/model/toolchains-jdks-extra.xml  |  45 
 .../maven/toolchain/model/toolchains-jdks.xml  |  43 
 .../resources/org/apache/maven/toolchain/user.xml  |  35 +++
 maven-toolchain-model/pom.xml  |   3 +
 pom.xml|   1 +
 26 files changed, 752 insertions(+), 32 deletions(-)

diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 2395531..75c5a69 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -135,6 +135,11 @@ under the License.
   
   
 org.apache.maven
+maven-toolchain-builder
+${project.version}
+  
+  
+org.apache.maven
 maven-slf4j-wrapper
 ${project.version}
   
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index e91263a..1dac274 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -58,6 +58,10 @@ under the License.
 
 
   org.apache.maven
+  maven-toolchain-builder
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-builder/pom.xml
similarity index 61%
copy from maven-toolchain-model/pom.xml
copy to maven-toolchain-builder/pom.xml
index e824643..5dcbea2 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-builder/pom.xml
@@ -29,26 +29,40 @@ under the License.
 
 4.0.0
 
-maven-toolchain-model
+maven-toolchain-builder
+
+Maven Toolchain Builder
+The effective toolchain builder.
 
 
 
+org.apache.maven
+maven-toolchain-model
+
+
+org.apache.maven
+maven-builder-support
+
+
+javax.inject
+javax.inject
+
+
 org.codehaus.plexus
-plexus-utils
+plexus-interpolation
+
+
+org.mockito
+mockito-core
+test
 
 
 
 
 
 
-org.codehaus.modello
-modello-maven-plugin
-
-1.1.0
-
-src/main/mdo/toolchains.mdo
-
-
+org.eclipse.sisu
+sisu-maven-plugin
 
 
 
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
similarity index 100%
rename from 
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
rename to 
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
 
b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
similarity index 100%
rename from 
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
rename to 
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
diff --git

[maven] branch MNG-6389-introduce-seperate-toolchain-artifact created (now 1099ca2)

2021-10-13 Thread mthmulders

This is an automated email from the ASF dual-hosted git repository.

mthmulders pushed a change to branch 
MNG-6389-introduce-seperate-toolchain-artifact
in repository https://gitbox.apache.org/repos/asf/maven.git.


  at 1099ca2  [MNG-6389] Update dependency/module graph

This branch includes the following new commits:

 new 64fdaaa  [MNG-6389] Move toolchain model to seperate module
 new 744d0a1  [MNG-6389] Seperate module for toolchain builder
 new 1099ca2  [MNG-6389] Update dependency/module graph

The 3 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.

80 matches

Mail list logo