[MSITE-1023] Upgrade plugins and components (in ITs)

apache · Oct 18, 2024 · 6171e7d · 6171e7d
1 parent efd8a57
commit 6171e7d
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -196,23 +196,24 @@ under the License.
     <javaVersion>8</javaVersion>
     <mavenVersion>3.6.3</mavenVersion>
     <!-- for dependencies -->
-    <jettyVersion>9.4.54.v20240208</jettyVersion>
+    <jettyVersion>9.4.56.v20240826</jettyVersion>
     <doxiaVersion>2.0.0</doxiaVersion>
     <doxiaSitetoolsVersion>2.0.0</doxiaSitetoolsVersion>
     <wagonVersion>3.5.3</wagonVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <!-- for ITs -->
-    <checkstylePluginVersion>3.3.1</checkstylePluginVersion>
-    <javadocPluginVersion>3.6.2</javadocPluginVersion>
-    <pmdPluginVersion>3.21.2</pmdPluginVersion>
-    <jxrPluginVersion>3.3.2</jxrPluginVersion>
-    <projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
-    <surefirePluginVersion>3.2.5</surefirePluginVersion>
-    <mavenPluginPluginVersion>3.13.0</mavenPluginPluginVersion>
-    <mavenReportingImplVersion>4.0.0-M15</mavenReportingImplVersion>
-    <fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion>
+    <checkstylePluginVersion>3.5.0</checkstylePluginVersion>
+    <javadocPluginVersion>3.10.1</javadocPluginVersion>
+    <pmdPluginVersion>3.25.0</pmdPluginVersion>
+    <jxrPluginVersion>3.5.0</jxrPluginVersion>
+    <projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
+    <surefirePluginVersion>3.5.1</surefirePluginVersion>
+    <mavenPluginPluginVersion>3.15.0</mavenPluginPluginVersion>
+    <taglistPluginVersion>3.2.1</taglistPluginVersion>
+    <antrunPluginVersion>3.1.0</antrunPluginVersion>
+    <mavenReportingImplVersion>4.0.0</mavenReportingImplVersion>
+    <fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion>
     <project.build.outputTimestamp>2024-08-14T15:58:15Z</project.build.outputTimestamp>
-
   </properties>
 
   <dependencies>
@@ -412,7 +413,7 @@ under the License.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.14.0</version>
+      <version>3.17.0</version>
     </dependency>
 
     <dependency>

diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml
@@ -65,7 +65,7 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>@taglistPluginVersion@</version>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml
@@ -42,7 +42,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.13.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/it/projects/MSITE-723/pom.xml b/src/it/projects/MSITE-723/pom.xml
@@ -44,7 +44,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
+        <version>@antrunPluginVersion@</version>
         <executions>
           <execution>
             <id>copy-site-files</id>

diff --git a/src/it/projects/MSITE-901/pom.xml b/src/it/projects/MSITE-901/pom.xml
@@ -34,7 +34,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.16.0</version>
+        <version>@pmdPluginVersion@</version>
         <executions>
           <execution>
             <goals>

diff --git a/src/it/projects/effective-site/pom.xml b/src/it/projects/effective-site/pom.xml
@@ -27,7 +27,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>42</version>
+    <version>43</version>
   </parent>
 
   <groupId>org.apache.maven.plugins.site.its</groupId>

diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml
@@ -22,7 +22,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>42</version>
+    <version>43</version>
   </parent>
 
   <groupId>org.apache.maven.plugins.site.its</groupId>
@@ -37,7 +37,7 @@ under the License.
   </issueManagement>
 
   <properties>
-    <version.maven-fluido-skin>2.0.0-M8</version.maven-fluido-skin>
+    <version.maven-fluido-skin>@fluidoSkinVersion@</version.maven-fluido-skin>
   </properties>
 
   <dependencies>
@@ -74,7 +74,7 @@ under the License.
           <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-shared-resources</artifactId>
-            <version>5</version>
+            <version>6</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -143,7 +143,10 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>@taglistPluginVersion@</version>
+        <configuration>
+          <skipEmptyReport>false</skipEmptyReport>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>

diff --git a/src/it/projects/inheritance-interpolation/child/pom.xml b/src/it/projects/inheritance-interpolation/child/pom.xml
@@ -42,7 +42,7 @@ under the License.
       <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>groovy-maven-plugin</artifactId>
-        <version>2.0</version>
+        <version>2.1.1</version>
         <executions>
           <execution>
             <!--phase>pre-site</phase-->

diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -41,7 +41,7 @@ under the License.
     <distUrl>scp://from.repo/dist</distUrl>
     <msite604.siteId>site-parent-id</msite604.siteId>
     <msite604.siteBase>default-repository-base-from-repo-parent</msite604.siteBase>
-    <fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
+    <fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
   </properties>
 
   <distributionManagement>
@@ -56,7 +56,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
+        <version>3.20.0</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
         <configuration>
           <generateReports>false</generateReports>
         </configuration>

diff --git a/src/it/projects/new-configuration/verify.groovy b/src/it/projects/new-configuration/verify.groovy
@@ -24,7 +24,7 @@ return true;
 assert !new File( basedir, 'target/surefire-reports' ).exists();
 assert !new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
 
-assert !new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert !new File( basedir, 'target/site/surefire.html' ).exists();
 assert new File( basedir, 'target/site/index.html' ).exists();
 assert !new File( basedir, 'target/site/checkstyle.html' ).exists();
 assert !new File( basedir, 'target/site/cpd.html' ).exists();
@@ -39,4 +39,4 @@ assert !new File( basedir, 'target/site/team-list.html' ).exists();
 
 assert !new File( basedir, 'target/site/dependencies.html' ).exists();
 
-return true;
+return true;
diff --git a/src/it/projects/no-version/verify.groovy b/src/it/projects/no-version/verify.groovy
@@ -25,7 +25,7 @@ assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' )
 
 assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
 
-assert new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert new File( basedir, 'target/site/surefire.html' ).exists();
 assert !new File( basedir, 'target/site/index.html' ).exists();
 
-return true;
+return true;
diff --git a/src/it/projects/resources/pom.xml b/src/it/projects/resources/pom.xml
@@ -53,7 +53,7 @@ under the License.
     <plugins>
       <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>@antrunPluginVersion@</version>
           <executions>
             <execution>
               <phase>pre-site</phase>

diff --git a/src/it/projects/site-attach-descriptor/pom.xml b/src/it/projects/site-attach-descriptor/pom.xml
@@ -60,7 +60,7 @@ under the License.
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.3</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/projects/surefire-report/verify.groovy b/src/it/projects/surefire-report/verify.groovy
@@ -25,7 +25,7 @@ assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' )
 
 assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
 
-assert new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert new File( basedir, 'target/site/surefire.html' ).exists();
 assert !new File( basedir, 'target/site/index.html' ).exists();
 
-return true;
+return true;