[maven-parent] branch dependabot/maven/org.apache.maven.shared-maven-shared-resources-4 created (now 5da7772)
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-resources-4 in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at 5da7772 Bump maven-shared-resources from 2 to 4 No new revisions were added by this update.
[maven-doap-plugin] branch stabilize updated: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git The following commit(s) were added to refs/heads/stabilize by this push: new 5473f9b Fix JavaDoc 5473f9b is described below commit 5473f9bd35e30ea3e4f670150d01c222e1d7711c Author: rfscholte AuthorDate: Tue Oct 12 21:04:58 2021 +0200 Fix JavaDoc --- src/main/java/org/apache/maven/plugin/doap/DoapMojo.java | 10 ++ 1 file changed, 6 insertions(+), 4 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 41faca1..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. + * + * 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. * * @author Jason van Zyl * @author mailto:vincent.sive...@gmail.com;>Vincent Siveton
[maven-doap-plugin] branch stabilize created (now 74521c9)
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. at 74521c9 Fix JavaDoc This branch includes the following new commits: new 74521c9 Fix JavaDoc 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-doap-plugin] 01/01: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git commit 74521c92224a987f8195266ee8071228bd87020d Author: rfscholte AuthorDate: Tue Oct 12 20:36:23 2021 +0200 Fix JavaDoc --- .../org/apache/maven/plugin/doap/DoapMojo.java | 4 +- src/main/mdo/asfextOptions.mdo | 10 ++--- src/main/mdo/doapOptions.mdo | 48 +++--- .../org/apache/maven/plugin/doap/DoapUtilTest.java | 2 +- 4 files changed, 32 insertions(+), 32 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..41faca1 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java @@ -81,8 +81,8 @@ 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. + * 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. * 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-filtering] branch dependabot/maven/commons-io-commons-io-2.11.0 created (now 2fc9b4f)
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-filtering.git. at 2fc9b4f Bump commons-io from 2.6 to 2.11.0 No new revisions were added by this update.
[maven-filtering] branch dependabot/maven/org.eclipse.sisu-org.eclipse.sisu.plexus-0.3.5 created (now 633a8ad)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.sisu-org.eclipse.sisu.plexus-0.3.5 in repository https://gitbox.apache.org/repos/asf/maven-filtering.git. at 633a8ad Bump org.eclipse.sisu.plexus from 0.0.0.M2a to 0.3.5 No new revisions were added by this update.
[maven] 01/01: [MNG-6914] use new apache-maven-wrapper module
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 c323cd3ac3f579346d0f8ab551463658d0bad77c
Author: Hervé Boutemy
AuthorDate: Tue Oct 12 12:39:56 2021 +0200
[MNG-6914] use new apache-maven-wrapper module
---
Jenkinsfile | 6 +-
Jenkinsfile.its | 2 +-
2 files changed, 6 insertions(+), 2 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"
}
}
}
[maven] branch MNG-6914_2 updated (a592113 -> c323cd3)
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 a592113 [MNG-6914] use new apache-maven-wrapper module new c323cd3 [MNG-6914] use new apache-maven-wrapper module 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 (a592113) \ N -- N -- N refs/heads/MNG-6914_2 (c323cd3) 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 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: Jenkinsfile | 1 + 1 file changed, 1 insertion(+)
[maven] 01/01: [MNG-6914] use new apache-maven-wrapper module
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 a592113bbc661c545bb43951af7b1d4fe86942e6
Author: Hervé Boutemy
AuthorDate: Tue Oct 12 12:39:56 2021 +0200
[MNG-6914] use new apache-maven-wrapper module
---
Jenkinsfile | 5 -
Jenkinsfile.its | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 54b8652..2a3cad3 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'
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"
}
}
}
[maven] branch MNG-6914_2 updated (847a182 -> a592113)
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. omit 847a182 [MNG-6914] use new apache-maven-wrapper module new a592113 [MNG-6914] use new apache-maven-wrapper module 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 (847a182) \ N -- N -- N refs/heads/MNG-6914_2 (a592113) 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 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: Jenkinsfile | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[maven] 01/01: Fix MojoDescriptor
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch do-not-keep-parameters-map
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 47c728c0234e6c70ba3582faf58c28a651f021f0
Author: Tamas Cservenak
AuthorDate: Tue Oct 12 13:19:18 2021 +0200
Fix MojoDescriptor
It may lead to confusion as parameters (list) and
parametersMap (map) may "fall apart" easily.
Also, parametersMap did not honor parameter
ordering while parameters list makes it look
that order is important.
Simply, rebuild the map always and retain
ordering as well.
---
.../maven/plugin/descriptor/MojoDescriptor.java | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index a15bdcf..f2f4348 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.descriptor;
* under the License.
*/
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -57,8 +57,6 @@ public class MojoDescriptor
private List parameters;
-private Map parameterMap;
-
/** By default, the execution strategy is "once-per-session" */
private String executionStrategy = SINGLE_PASS_EXEC_STRATEGY;
@@ -229,20 +227,18 @@ public class MojoDescriptor
}
/**
- * @return the list parameters as a Map
+ * @return the list parameters as a Map that is built from {@link
#parameters} list. Any change to this map is NOT
+ * reflected on list and other way around!
*/
public Map getParameterMap()
{
-if ( parameterMap == null )
-{
-parameterMap = new HashMap<>();
+LinkedHashMap parameterMap = new LinkedHashMap<>();
-if ( parameters != null )
+if ( parameters != null )
+{
+for ( Parameter pd : parameters )
{
-for ( Parameter pd : parameters )
-{
-parameterMap.put( pd.getName(), pd );
-}
+parameterMap.put( pd.getName(), pd );
}
}
[maven] branch do-not-keep-parameters-map created (now 47c728c)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch do-not-keep-parameters-map in repository https://gitbox.apache.org/repos/asf/maven.git. at 47c728c Fix MojoDescriptor This branch includes the following new commits: new 47c728c Fix MojoDescriptor 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] branch MNG-6914_2 updated: [MNG-6914] use new apache-maven-wrapper module
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
The following commit(s) were added to refs/heads/MNG-6914_2 by this push:
new 847a182 [MNG-6914] use new apache-maven-wrapper module
847a182 is described below
commit 847a182b3f9a82175d966d10baff18a52fc66754
Author: Hervé Boutemy
AuthorDate: Tue Oct 12 12:39:56 2021 +0200
[MNG-6914] use new apache-maven-wrapper module
---
Jenkinsfile.its | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"
}
}
}
svn commit: r50367 - in /release/maven/shared: maven-shared-resources-3-source-release.zip maven-shared-resources-3-source-release.zip.asc maven-shared-resources-3-source-release.zip.sha512
Author: hboutemy Date: Tue Oct 12 06:13:08 2021 New Revision: 50367 Log: maven-shared-resources 4 released Removed: release/maven/shared/maven-shared-resources-3-source-release.zip release/maven/shared/maven-shared-resources-3-source-release.zip.asc release/maven/shared/maven-shared-resources-3-source-release.zip.sha512
