You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/05/22 17:09:48 UTC

[maven-dist-tool] branch master updated: align content with conf

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-dist-tool.git


The following commit(s) were added to refs/heads/master by this push:
     new 619393d  align content with conf
619393d is described below

commit 619393d9c695778c960aaf517fd7b6bd434a0a44
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun May 22 19:09:45 2022 +0200

    align content with conf
---
 .../org/apache/maven/dist/tools/branches/ListBranchesReport.java  | 3 ++-
 .../apache/maven/dist/tools/prerequisites/GetPrerequisites.java   | 8 +++++++-
 src/main/resources/dist-tool.conf                                 | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
index 8856465..2e7e2b1 100644
--- a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
@@ -131,6 +131,7 @@ public class ListBranchesReport extends AbstractMavenReport
         JIRAPROJECTS.put( "maven-jmod-plugin", "MJMOD" );
         JIRAPROJECTS.put( "maven-jxr", "JXR" );
         JIRAPROJECTS.put( "maven-linkcheck-plugin", "MLINKCHECK" );
+        JIRAPROJECTS.put( "maven-mapping", "MSHARED" );
         JIRAPROJECTS.put( "maven-parent", "MPOM" );
         JIRAPROJECTS.put( "maven-patch-plugin", "MPATCH" );
         JIRAPROJECTS.put( "maven-pdf-plugin", "MPDF" );
@@ -168,7 +169,7 @@ public class ListBranchesReport extends AbstractMavenReport
         JIRAPROJECTS.put( "maven-verifier-plugin", "MVERIFIER" );
         JIRAPROJECTS.put( "maven-wagon", "WAGON" );
         JIRAPROJECTS.put( "maven-war-plugin", "MWAR" );
-        JIRAPROJECTS.put( "maven-wrapper-plugin", "MWRAPPER" );
+        JIRAPROJECTS.put( "maven-wrapper", "MWRAPPER" );
     }
 
 
diff --git a/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java b/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
index 6f7ed21..b62d38e 100644
--- a/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
+++ b/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
@@ -67,6 +67,10 @@ public class GetPrerequisites
         "maven-jar-plugin",
         "maven-jarsigner-plugin",
         "maven-javadoc-plugin",
+        "maven-jdeprscan-plugin",
+        "maven-jdeps-plugin",
+        "maven-jlink-plugin",
+        "maven-jmod-plugin",
         "maven-jxr-plugin",
         "maven-linkcheck-plugin",
         "maven-patch-plugin",
@@ -77,10 +81,11 @@ public class GetPrerequisites
         "maven-rar-plugin",
         "maven-release-plugin",
         "maven-remote-resources-plugin",
-        "maven-repository-plugin",
+        // "maven-repository-plugin", retired
         "maven-resources-plugin",
         "maven-scm-plugin",
         "maven-scm-publish-plugin",
+        "maven-scripting-plugin",
         "maven-shade-plugin",
         "maven-site-plugin",
         "maven-source-plugin",
@@ -90,6 +95,7 @@ public class GetPrerequisites
         "maven-toolchains-plugin",
         "maven-verifier-plugin",
         "maven-war-plugin",
+        "maven-wrapper-plugin",
     };
 
     private static final String BASEURL = "https://maven.apache.org/plugins/";
diff --git a/src/main/resources/dist-tool.conf b/src/main/resources/dist-tool.conf
index fec9b01..44c92cb 100644
--- a/src/main/resources/dist-tool.conf
+++ b/src/main/resources/dist-tool.conf
@@ -83,6 +83,7 @@
 /plugin-tools: org.apache.maven.plugin-tools
   maven-plugin-tools
 
+# when adding a plugin, don't forget org.apache.maven.dist.tools.prerequisites.GetPrerequisite
 /plugins: org.apache.maven.plugins https://maven.apache.org/plugins/
   maven-acr-plugin
   maven-antrun-plugin