[MSITE-883] Upgrade plugins in ITs

* Maven Javadoc Plugin to 3.3.2 * Maven JXR Plugin to 3.1.1 * Maven Project Info Reports Plugin to 3.2.1 * Maven Changelog Plugin to 2.3 * Taglist Maven Plugin to 3.0.0 * Maven Changes Plugin to 2.12.1
apache · Feb 11, 2022 · eca1960 · eca1960
1 parent db0ed41
commit eca1960
Show file tree

Hide file tree

Showing 38 changed files with 48 additions and 223 deletions.
diff --git a/pom.xml b/pom.xml
@@ -207,11 +207,12 @@ under the License.
     <slf4jVersion>1.7.32</slf4jVersion>
     <!-- for ITs -->
     <checkstylePluginVersion>2.9.1</checkstylePluginVersion>
-    <javadocPluginVersion>3.2.0</javadocPluginVersion>
+    <javadocPluginVersion>3.3.2</javadocPluginVersion>
     <pmdPluginVersion>3.11.0</pmdPluginVersion>
-    <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+    <jxrPluginVersion>3.1.1</jxrPluginVersion>
+    <projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
     <surefirePluginVersion>2.22.2</surefirePluginVersion>
-	<surefire.version>2.22.2</surefire.version>
+    <surefire.version>2.22.2</surefire.version>
     <project.build.outputTimestamp>2021-12-22T09:25:46Z</project.build.outputTimestamp>
   </properties>
 

diff --git a/src/it/projects/MSITE-159/pom.xml b/src/it/projects/MSITE-159/pom.xml
@@ -47,13 +47,6 @@ under the License.
           <configuration>
             <relativizeDecorationLinks>false</relativizeDecorationLinks>
           </configuration>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml
@@ -44,13 +44,6 @@ under the License.
         <configuration>
           <locales>en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN</locales>
         </configuration>
-        <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-          <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-module-markdown</artifactId>
-            <version>1.7</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/projects/MSITE-458/pom.xml b/src/it/projects/MSITE-458/pom.xml
@@ -44,13 +44,6 @@ under the License.
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <version>@project.version@</version>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/MSITE-484/parent-usage-test/pom.xml b/src/it/projects/MSITE-484/parent-usage-test/pom.xml
@@ -47,7 +47,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
+        <version>@jxrPluginVersion@</version>
       </plugin>
       <!-- Overriding an inherited plugin -->
       <plugin>

diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml
@@ -74,7 +74,7 @@ under the License.
       <id>maven-3</id>
       <activation>
         <file>
-          <!-- This employs that the basedir expression is only recognized 
+          <!-- This employs that the basedir expression is only recognized
             by Maven 3.x (see MNG-2363) -->
           <exists>${basedir}</exists>
         </file>
@@ -86,13 +86,6 @@ under the License.
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-site-plugin</artifactId>
               <version>@project.version@</version>
-              <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-                <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-markdown</artifactId>
-                  <version>1.7</version>
-                </dependency>
-              </dependencies>
             </plugin>
           </plugins>
         </pluginManagement>

diff --git a/src/it/projects/MSITE-512/parent-usage-test/pom.xml b/src/it/projects/MSITE-512/parent-usage-test/pom.xml
@@ -79,7 +79,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
+        <version>@jxrPluginVersion@</version>
       </plugin>
 
     </plugins>  

diff --git a/src/it/projects/MSITE-566/pom.xml b/src/it/projects/MSITE-566/pom.xml
@@ -43,13 +43,6 @@ under the License.
           <configuration>
             <generateReports>false</generateReports>
           </configuration>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/MSITE-582/pom.xml b/src/it/projects/MSITE-582/pom.xml
@@ -41,13 +41,6 @@ under the License.
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <version>@project.version@</version>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-609/pom.xml
@@ -49,13 +49,6 @@ under the License.
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <version>@project.version@</version>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/projects/MSITE-658/pom.xml b/src/it/projects/MSITE-658/pom.xml
@@ -46,13 +46,6 @@ under the License.
           <configuration>
             <locales>en,de</locales>
           </configuration>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/MSITE-723/pom.xml b/src/it/projects/MSITE-723/pom.xml
@@ -22,7 +22,7 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <groupId>maven-site-index-test</groupId>
   <artifactId>MSITE-723</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -64,13 +64,6 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <version>@project.version@</version>
-        <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-          <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-module-markdown</artifactId>
-            <version>1.7</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/projects/default-reports/verify.groovy b/src/it/projects/default-reports/verify.groovy
@@ -20,6 +20,9 @@
 
 sitedir = new File( basedir, 'target/site' );
 
+assert new File( sitedir, 'dependency-info.html' ).exists();
 assert new File( sitedir, 'index.html' ).exists();
-assert new File( sitedir, 'team-list.html' ).exists();
-assert new File( sitedir, 'dependencies.html' ).exists();
+assert new File( sitedir, 'plugin-management.html' ).exists();
+assert new File( sitedir, 'plugins.html' ).exists();
+assert new File( sitedir, 'project-info.html' ).exists();
+assert new File( sitedir, 'summary.html' ).exists();
diff --git a/src/it/projects/failure/pom.xml b/src/it/projects/failure/pom.xml
@@ -99,7 +99,7 @@ under the License.
         <plugins>
           <plugin>
             <artifactId>maven-changelog-plugin</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
           </plugin>
         </plugins>
       </reporting>

diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>31</version>
+    <version>34</version>
   </parent>
 
   <groupId>org.apache.maven.plugins.site.its</groupId>
@@ -34,6 +34,11 @@ under the License.
 
   <name>maven-site-plugin IT: full reporting</name>
 
+  <issueManagement>
+    <system>default</system>
+    <url>http://localhost/issues</url>
+  </issueManagement>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -93,13 +98,13 @@ under the License.
             <reports>
               <report>index</report>
               <report>summary</report>
-              <report>license</report>
-              <report>project-team</report>
+              <report>licenses</report>
+              <report>team</report>
               <report>scm</report>
-              <report>issue-tracking</report>
-              <report>mailing-list</report>
+              <report>issue-management</report>
+              <report>mailing-lists</report>
               <report>dependencies</report>
-              <report>cim</report>
+              <report>ci-management</report>
               <report>plugin-management</report>
               <report>plugins</report>
             </reports>
@@ -124,6 +129,11 @@ under the License.
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>@checkstylePluginVersion@</version>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>3.0.0</version>
+      </plugin>
     </plugins>
   </reporting>
 

diff --git a/src/it/projects/full-reporting/verify.groovy b/src/it/projects/full-reporting/verify.groovy
@@ -38,22 +38,22 @@ assert new File( sitedir, 'xref/index.html' ).exists();
 assert new File( sitedir, 'xref-test/index.html' ).exists();
 
 assert new File( sitedir, 'taglist.html' ).exists();
-assert new File( sitedir, 'team-list.html' ).exists();
+assert new File( sitedir, 'team.html' ).exists();
 
 assert new File( sitedir, 'dependencies.html' ).exists();
 content = new File( sitedir, 'dependencies.html' ).text;
 assert content.contains( 'junit:junit:jar:3.8.2' );
 
 // check reports order
 String[] reports = [ 'index',                  // <report>index</report>
-                     'project-summary',        // <report>summary</report>
-                     'license',                // <report>license</report>
-                     'team-list',              // <report>project-team</report>
-                     'source-repository',      // <report>scm</report>
-                     'issue-tracking',         // <report>issue-tracking</report>
-                     'mail-lists',             // <report>mailing-list</report>
+                     'summary',                // <report>summary</report>
+                     'licenses',               // <report>licenses</report>
+                     'team',                   // <report>team</report>
+                     'scm',                    // <report>scm</report>
+                     'issue-management',       // <report>issue-management</report>
+                     'mailing-lists',          // <report>mailing-lists</report>
                      'dependencies',           // <report>dependencies</report>
-                     'integration',            // <report>cim</report>
+                     'ci-management',          // <report>ci-management</report>
                      'plugin-management',      // <report>plugin-management</report>
                      'plugins'                 // <report>plugins</report>
                    ];

diff --git a/src/it/projects/inheritance-interpolation/pom.xml b/src/it/projects/inheritance-interpolation/pom.xml
@@ -49,13 +49,6 @@ under the License.
         <configuration>
           <generateReports>false</generateReports>
         </configuration>
-        <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-          <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-module-markdown</artifactId>
-            <version>1.7</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -67,13 +67,6 @@ under the License.
             </goals>
           </execution>
         </executions>
-        <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-          <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-module-markdown</artifactId>
-            <version>1.7</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/src/it/projects/inheritedMenus/parentAsRef/pom.xml b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
@@ -46,13 +46,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>@project.version@</version>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
@@ -46,13 +46,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>@project.version@</version>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/inheritedMenus/pom.xml b/src/it/projects/inheritedMenus/pom.xml
@@ -40,13 +40,6 @@ under the License.
           <configuration>
             <generateReports>false</generateReports>
           </configuration>
-          <dependencies><!-- TODO remove when prerequisite is Java 7 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
-          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/report-changes-generation/pom.xml b/src/it/projects/report-changes-generation/pom.xml
@@ -47,7 +47,7 @@
   </issueManagement>
 
   <properties>
-    <changesPluginVersion>2.1</changesPluginVersion>
+    <changesPluginVersion>2.12.1</changesPluginVersion>
   </properties>
 
   <build>
@@ -57,9 +57,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-changes-plugin</artifactId>
           <version>${changesPluginVersion}</version>
-          <configuration>
-            <issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
-          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -96,9 +93,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
         <version>${changesPluginVersion}</version>
-        <configuration>
-          <issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
-        </configuration>
         <reportSets>
           <reportSet>
             <reports>

diff --git a/src/it/projects/report-changes-generation/src/changes/changes.xml b/src/it/projects/report-changes-generation/src/changes/changes.xml
@@ -42,7 +42,7 @@ under the License.
       </action>
       <action dev="you" type="update" system="bugzilla">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
+        <fixes issue="BUG-12345"/>
         <dueto name="John Doe" email="[email protected]"/>
       </action>
       <action dev="him" type="update">