From 636442b317e5506ca6687375c1d86c7395152f93 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Sun, 18 Aug 2024 22:55:32 +0200
Subject: [PATCH] Improve ITs

---
 pom.xml                                       |  1 -
 src/it/projects/MJAVADOC-257/mymojo/pom.xml   |  2 +-
 src/it/projects/MJAVADOC-257/pom.xml          | 25 +++++++++++++------
 .../mojo/pom.xml                              |  8 +++---
 .../MJAVADOC-569_aggr-mixed/module2/pom.xml   |  3 +++
 .../projects/MJAVADOC-569_aggr-mixed/pom.xml  |  4 +--
 src/it/projects/MJAVADOC-591_release8/pom.xml |  5 ----
 .../MJAVADOC-280-4-projects/pom.xml           |  5 ----
 8 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ebd124dc..454b6ffe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,6 @@ under the License.
     <!-- for ITs -->
     <compilerPluginVersion>3.11.0</compilerPluginVersion>
     <sourcePluginVersion>3.3.0</sourcePluginVersion>
-    <surefirePluginVersion>3.2.2</surefirePluginVersion>
     <enforcerPluginVersion>3.4.1</enforcerPluginVersion>
     <pluginPluginVersion>3.10.1</pluginPluginVersion>
     <jarPluginVersion>3.3.0</jarPluginVersion>
diff --git a/src/it/projects/MJAVADOC-257/mymojo/pom.xml b/src/it/projects/MJAVADOC-257/mymojo/pom.xml
index 100cb526d..15d3a3b3b 100644
--- a/src/it/projects/MJAVADOC-257/mymojo/pom.xml
+++ b/src/it/projects/MJAVADOC-257/mymojo/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
+      <version>@mavenVersion@</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/projects/MJAVADOC-257/pom.xml b/src/it/projects/MJAVADOC-257/pom.xml
index b36394f36..4f76bf24d 100644
--- a/src/it/projects/MJAVADOC-257/pom.xml
+++ b/src/it/projects/MJAVADOC-257/pom.xml
@@ -81,13 +81,24 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>@project.version@</version>
         <configuration>
-          <tagletArtifacts>
-            <tagletArtifact>
-              <groupId>org.apache.maven.plugin-tools</groupId>
-              <artifactId>maven-plugin-tools-javadoc</artifactId>
-              <version>3.3</version>
-            </tagletArtifact>
-          </tagletArtifacts>
+         <tags>
+           <tag>
+             <name>goal</name>
+             <placement>X</placement>
+           </tag>
+           <tag>
+             <name>phase</name>
+             <placement>X</placement>
+           </tag>
+           <tag>
+             <name>parameter</name>
+             <placement>X</placement>
+           </tag>
+           <tag>
+             <name>required</name>
+             <placement>X</placement>
+           </tag>
+         </tags>
         </configuration>
         <reportSets>
           <reportSet>
diff --git a/src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml b/src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml
index 51d675169..0055bcfc5 100644
--- a/src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml
+++ b/src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml
@@ -50,17 +50,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.6.0</version>
+      <version>@mavenVersion@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.8.1</version>
+      <version>@mavenVersion@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
+      <version>@pluginPluginVersion@</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -69,4 +69,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml b/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml
index c9d0b20cf..237571d47 100644
--- a/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml
+++ b/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml
@@ -65,6 +65,9 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <goalPrefix>module2</goalPrefix>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml b/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml
index dd9048129..d6bca28c7 100644
--- a/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml
+++ b/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml
@@ -44,12 +44,12 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>3.0</version>
+        <version>@mavenVersion@</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-annotations</artifactId>
-        <version>3.6.0</version>
+        <version>@pluginPluginVersion@</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/src/it/projects/MJAVADOC-591_release8/pom.xml b/src/it/projects/MJAVADOC-591_release8/pom.xml
index 406d1b1be..5b452f536 100644
--- a/src/it/projects/MJAVADOC-591_release8/pom.xml
+++ b/src/it/projects/MJAVADOC-591_release8/pom.xml
@@ -44,11 +44,6 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>@surefirePluginVersion@</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
diff --git a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
index ace6ddaf1..3c9a89d34 100644
--- a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
+++ b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
@@ -90,11 +90,6 @@ under the License.
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>@surefirePluginVersion@</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>