You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/01/07 00:53:57 UTC

[maven-artifact-plugin] branch master updated: [MARTIFACT-4] add ignoreJavadoc parameter, default to true

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 fe003f2  [MARTIFACT-4] add ignoreJavadoc parameter, default to true
fe003f2 is described below

commit fe003f2ebab91aa12fa49f8347b2e66e96c7b16b
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Jan 7 01:53:53 2021 +0100

    [MARTIFACT-4] add ignoreJavadoc parameter, default to true
---
 .../maven/plugins/artifact/buildinfo/BuildInfoWriter.java    | 12 +++++++++++-
 .../maven/plugins/artifact/buildinfo/BuildinfoMojo.java      |  7 +++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
index bc1fe1f..5d4f64f 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
@@ -43,6 +43,7 @@ public class BuildInfoWriter
     private final boolean mono;
     private final Map<Artifact, String> artifacts = new LinkedHashMap<>();
     private int projectCount = -1;
+    private boolean ignoreJavadoc = true;
 
     BuildInfoWriter( Log log, PrintWriter p, boolean mono )
     {
@@ -143,7 +144,7 @@ public class BuildInfoWriter
                 // ignore pgp signatures
                 continue;
             }
-            if ( "javadoc".equals( attached.getClassifier() ) )
+            if ( ignoreJavadoc && "javadoc".equals( attached.getClassifier() ) )
             {
                 // TEMPORARY ignore javadoc, waiting for MJAVADOC-627 in m-javadoc-p 3.2.0
                 continue;
@@ -236,4 +237,13 @@ public class BuildInfoWriter
         }
     }
 
+    public boolean getIgnoreJavadoc()
+    {
+        return ignoreJavadoc;
+    }
+
+    public void setIgnoreJavadoc( boolean ignoreJavadoc )
+    {
+        this.ignoreJavadoc = ignoreJavadoc;
+    }
 }
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
index 6ff786a..f29ecff 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
@@ -79,6 +79,12 @@ public class BuildinfoMojo
     private File buildinfoFile;
 
     /**
+     * Ignore javadoc attached artifacts from buildinfo generation.
+     */
+    @Parameter( property = "buildinfo.ignoreJavadoc", defaultValue = "true" )
+    private boolean ignoreJavadoc;
+
+    /**
      * Specifies whether to attach the generated buildinfo file to the project.
      */
     @Parameter( property = "buildinfo.attach", defaultValue = "true" )
@@ -205,6 +211,7 @@ public class BuildinfoMojo
                 new OutputStreamWriter( new FileOutputStream( buildinfoFile ), Charsets.ISO_8859_1 ) ) ) )
         {
             BuildInfoWriter bi = new BuildInfoWriter( getLog(), p, mono );
+            bi.setIgnoreJavadoc( ignoreJavadoc );
 
             bi.printHeader( root );