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

apache · Apr 18, 2024 · 1bbad2d · 1bbad2d
1 parent 036997f
commit 1bbad2d
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -198,19 +198,19 @@ under the License.
     <javaVersion>8</javaVersion>
     <!-- for dependencies -->
     <jettyVersion>9.4.53.v20231009</jettyVersion>
-    <doxiaVersion>2.0.0-M8</doxiaVersion>
-    <doxiaSitetoolsVersion>2.0.0-M16</doxiaSitetoolsVersion>
+    <doxiaVersion>2.0.0-M9</doxiaVersion>
+    <doxiaSitetoolsVersion>2.0.0-M17</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.1</jxrPluginVersion>
+    <jxrPluginVersion>3.3.2</jxrPluginVersion>
     <projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
     <surefirePluginVersion>3.2.2</surefirePluginVersion>
-    <mavenPluginPluginVersion>3.10.2</mavenPluginPluginVersion>
-    <mavenReportingImplVersion>4.0.0-M13</mavenReportingImplVersion>
+    <mavenPluginPluginVersion>3.11.0</mavenPluginPluginVersion>
+    <mavenReportingImplVersion>4.0.0-M14</mavenReportingImplVersion>
     <testingFluidoSkinVersion>2.0.0-M8</testingFluidoSkinVersion>
     <project.build.outputTimestamp>2023-12-14T15:35:29Z</project.build.outputTimestamp>
 
@@ -220,12 +220,12 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>4.0.0-M9</version>
+      <version>4.0.0-M10</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-exec</artifactId>
-      <version>2.0.0-M12</version>
+      <version>2.0.0-M13</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

diff --git a/src/it/projects/MSITE-507/pom.xml b/src/it/projects/MSITE-507/pom.xml
@@ -47,7 +47,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>@jxrPluginVersion@</version>
           <configuration>
             <aggregate>true</aggregate>
             <inputEncoding>utf-8</inputEncoding>

diff --git a/src/it/projects/MSITE-627/pom.xml b/src/it/projects/MSITE-627/pom.xml
@@ -58,6 +58,15 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <configuration>
+          <goalPrefix>MSITE-627</goalPrefix>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>

diff --git a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkAdapter;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.project.MavenProject;
@@ -79,7 +80,7 @@ protected void executeReport( Locale locale )
         final Sink sa = new SinkAdapter()
         {
             @Override
-            public void text( String text )
+            public void text( String text, SinkEventAttributes attributes )
             {
                 s.text( text.replace( "OK", "passed" ) );
             }

diff --git a/src/it/projects/MSITE-842/project/pom.xml b/src/it/projects/MSITE-842/project/pom.xml
@@ -61,6 +61,9 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <version>@mavenPluginPluginVersion@</version>
+        <configuration>
+          <goalPrefix>MSITE-842</goalPrefix>
+        </configuration>
       </plugin>
     </plugins>
 

diff --git a/src/it/projects/inheritance-interpolation/child/src/site/apt/pom.apt.vm b/src/it/projects/inheritance-interpolation/child/src/site/apt/pom.apt.vm
@@ -64,14 +64,14 @@ POM Inheritance and Interpolation
   {{{http://maven.apache.org/ref/3-LATEST/maven-model-builder/} reference documentation}}.
 
   Same test with <<<project.url>>>: top parent defines url with a property that is
-  not defined, then property is defined in some childs:
+  not defined, then property is defined in some children:
 
 #set( $p = $project )
 *-------*------*-------*
 || level || artifactId || <<<project.url>>> value ||
 *-------+------+--------+
 #foreach( $i in [1..4] )
-#if( $p )|    $i| <<<$p.artifactId>>> | <<<$p.url>>>
+#if( $p )|    $i| <<<$p.artifactId>>> | <<<$p.url.replace('{', '\{')>>>
 *-------+------+--------+
 #set( $p = $p.parent )#end
 #end

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.siteRepositoryId>repo-parent-id</msite604.siteRepositoryId>
     <msite604.siteRepositoryBase>default-repository-base-from-repo-parent</msite604.siteRepositoryBase>
-    <fluidoSkinVersion>2.0.0-M3</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
+    <fluidoSkinVersion>2.0.0-M8</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>4.0.0-M5</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
+        <version>4.0.0-M13</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/inheritance-interpolation/verify.groovy b/src/it/projects/inheritance-interpolation/verify.groovy
@@ -28,8 +28,8 @@ assert content.contains( "<<<project.artifactId = 'reactor-parent'>>>" );
 assert content.contains( "<<<project.artifactId = 'child'>>>" );
 
 // url check (with its inheritance)
-assert content.contains( '<<<http://maven.apache.org/${property}>>>' ); // repo-parent
-assert content.contains( '<<<http://maven.apache.org/${property}/relative-parent>>>' ); // relative-parent
+assert content.contains( '<<<http://maven.apache.org/$\\{property}>>>' ); // repo-parent
+assert content.contains( '<<<http://maven.apache.org/$\\{property}/relative-parent>>>' ); // relative-parent
 assert content.contains( '<<<http://maven.apache.org/prop-value-from-reactor-parent/relative-parent/reactor-parent>>>' ); // reactor-parent
 assert content.contains( '<<<http://maven.apache.org/prop-value-from-child/relative-parent/reactor-parent/child>>>' ); // child