diff --git a/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java b/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
index 62b50600a7..d5046742d9 100644
--- a/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
+++ b/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
@@ -478,6 +478,18 @@ public class JavadocReport
*/
private String stylesheetfile;
+ /**
+ * Contains a list of tag names, which will result in conversion to support the following, from the javadoc
+ * API:
+ *
+ * Enables the Javadoc tool to interpret a simple, one-argument custom block tag tagname in doc comments.
+ * See tag.
+ * It is a comma separated String.
+ *
+ * @parameter expression="${tags}"
+ */
+ private ArrayList tags;
+
/**
* Enables the Javadoc tool to interpret a simple, one-argument custom block tag tagname in doc comments.
* See tag.
@@ -824,7 +836,19 @@ public class JavadocReport
addArgIf( arguments, serialwarn, "-serialwarn" );
addArgIf( arguments, splitindex, "-splitindex" );
addArgIfNotEmpty( arguments, "-stylesheetfile", quotedPathArgument( stylesheetfile ) );
+
addArgIfNotEmpty( arguments, "-tag", quotedArgument( tag ), 1.4f, true );
+
+ if ( tags != null && !tags.isEmpty() )
+ {
+ for ( Iterator it = tags.iterator(); it.hasNext(); )
+ {
+ String tag = (String) it.next();
+
+ addArgIfNotEmpty( arguments, "-tag", quotedArgument( tag ), 1.4f, true );
+ }
+ }
+
addArgIfNotEmpty( arguments, "-taglet", quotedArgument( taglet ), 1.4f );
addArgIfNotEmpty( arguments, "-tagletpath", quotedPathArgument( tagletpath ), 1.4f );
addArgIf( arguments, use, "-use" );