From b373c6c832b1c5186d88a534ea48c63ba02be5a8 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Sun, 17 Apr 2022 01:48:50 +0200
Subject: [PATCH] Clean up and add

---
 pom.xml                                       | 10 ++++++++++
 .../plugins/javadoc/JavadocReportTest.java    | 20 ++-----------------
 .../tagletArtifacts-test-plugin-config.xml    |  5 -----
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3254dfb76..a8507b12d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,6 +371,16 @@ under the License.
       <classifier>shaded</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-connector-basic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-transport-wagon</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 3eac8534b..4200ec055 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -1209,24 +1209,8 @@ public void testTagletArtifacts()
         assertThat( optionsFile ).exists();
         String options = readFile( optionsFile );
         // count -taglet
-        assertThat( StringUtils.countMatches( options, LINE_SEPARATOR + "-taglet" + LINE_SEPARATOR ) ).isEqualTo( 22 );
-        assertThat( options ).contains( "org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet" )
-                .contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet" )
+        assertThat( StringUtils.countMatches( options, LINE_SEPARATOR + "-taglet" + LINE_SEPARATOR ) ).isEqualTo( 3 );
+        assertThat( options )
                 .contains( "org.codehaus.plexus.javadoc.PlexusConfigurationTaglet" )
                 .contains( "org.codehaus.plexus.javadoc.PlexusRequirementTaglet" )
                 .contains( "org.codehaus.plexus.javadoc.PlexusComponentTaglet" );
diff --git a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
index 0656dc06c..8639b5575 100644
--- a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
+++ b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
@@ -65,11 +65,6 @@ under the License.
           <debug>true</debug>
           <failOnError>true</failOnError>
           <tagletArtifacts>
-            <tagletArtifact>
-              <groupId>org.apache.maven.plugin-tools</groupId>
-              <artifactId>maven-plugin-tools-javadoc</artifactId>
-              <version>3.5</version>
-            </tagletArtifact>
             <tagletArtifact>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-javadoc</artifactId>