[maven-surefire] branch mvn4 updated: Switch a few core plugins to the new api

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/mvn4 by this push:
     new fd37565  Switch a few core plugins to the new api
fd37565 is described below

commit fd3756554a2f4bf5436add63a47c1096317cf731
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Feb 24 17:00:56 2022 +0100

    Switch a few core plugins to the new api
---
 .../maven/plugins/surefire/report/Surefire1183Test.java      |  4 ++--
 .../plugins/surefire/report/SurefireReportMojoTest.java      |  4 ++--
 pom.xml                                                      | 12 +++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git 
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
 
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
index 2ce686d..e87c387 100644
--- 
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
+++ 
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
@@ -49,7 +49,7 @@ public class Surefire1183Test extends AbstractMojoTestCase
             throws Exception
     {
         super.setUp();
-        renderer = (Renderer) lookup( Renderer.ROLE );
+        renderer = lookup( Renderer.class );
     }
 
     private File getTestBaseDir()
@@ -82,7 +82,7 @@ public class Surefire1183Test extends AbstractMojoTestCase
             outputHtml.getParentFile().mkdirs();
             writer = WriterFactory.newXmlWriter ( outputHtml );
 
-            renderer.generateDocument( writer, (SiteRendererSink ) 
mojo.getSink(), context );
+            renderer.mergeDocumentIntoSite( writer, (SiteRendererSink ) 
mojo.getSink(), context );
         }
         finally
         {
diff --git 
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
 
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
index 4fa4298..73cced0 100644
--- 
a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
+++ 
b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
@@ -55,7 +55,7 @@ public class SurefireReportMojoTest
         throws Exception
     {
         super.setUp();
-        renderer = (Renderer) lookup( Renderer.ROLE );
+        renderer = lookup( Renderer.class );
     }
 
     public void testBasicSurefireReport()
@@ -642,7 +642,7 @@ public class SurefireReportMojoTest
             outputHtml.getParentFile().mkdirs();
             writer = WriterFactory.newXmlWriter( outputHtml );
 
-            renderer.generateDocument( writer, (SiteRendererSink) 
mojo.getSink(), context );
+            renderer.mergeDocumentIntoSite( writer, (SiteRendererSink) 
mojo.getSink(), context );
         }
         finally
         {
diff --git a/pom.xml b/pom.xml
index 1a7b9c9..d554f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,12 +93,12 @@
     <commonsCompress>1.21</commonsCompress>
     <commonsIoVersion>2.11.0</commonsIoVersion>
     <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
-    <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+    <doxiaSitetoolsVersion>2.0.0-M3-SNAPSHOT</doxiaSitetoolsVersion>
     <plexus-java-version>1.1.0</plexus-java-version>
     <!-- maven-shared-utils:3.3.4 uses org.fusesource.jansi:jansi:2.2.0 -->
     <mavenSharedUtilsVersion>4.0.0-SNAPSHOT</mavenSharedUtilsVersion>
     <powermockVersion>2.0.9</powermockVersion>
-    <mavenPluginToolsVersion>3.6.2</mavenPluginToolsVersion>
+    <mavenPluginToolsVersion>3.6.5-SNAPSHOT</mavenPluginToolsVersion>
     <jacocoVersion>0.8.7</jacocoVersion>
     
<surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
     
<maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
@@ -134,6 +134,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core-api</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
         <version>${mavenVersion}</version>
         <scope>provided</scope>
@@ -462,7 +468,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.20</version>
+          <version>1.21</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>