commit 7d450101c9be94953b4a634766b479883f92cc2a
author Robert Scholte <rfscholte@apache.org> Wed May 18 15:15:08 2016 +0000
committer Robert Scholte <rfscholte@apache.org> Wed May 18 15:15:08 2016 +0000
tree 1ea86270e74eb57fb9a1762b33a7787b04376221
parent 17951a1e4f163f9f78161246b61f068924e247b9

[MPOM-122] Remove tagletArtifact org.apache.maven.plugin-tools:maven-plugin-tools-javadoc from maven-javadoc-plugin
Give plexus-javadoc a combine.id, so it can be easily merged.

git-svn-id: https://svn.apache.org/repos/asf/maven/pom/trunk@1744422 13f79535-47bb-0310-9956-ffa450edef68

maven/pom.xml

diff --git a/maven/pom.xml b/maven/pom.xml
index 514da3e..ee526d1 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -1255,12 +1255,7 @@
               <quiet>true</quiet>
               <detectLinks>true</detectLinks>
               <tagletArtifacts>
-                <tagletArtifact>
-                  <groupId>org.apache.maven.plugin-tools</groupId>
-                  <artifactId>maven-plugin-tools-javadoc</artifactId>
-                  <version>${mavenPluginToolsVersion}</version>
-                </tagletArtifact>
-                <tagletArtifact>
+                <tagletArtifact combine.id="org.codehaus.plexus:plexus-javadoc">
                   <groupId>org.codehaus.plexus</groupId>
                   <artifactId>plexus-javadoc</artifactId>
                   <version>1.0</version>