Upgrade doxia to 2.0.0 and maven-reporting-api to 4.0.0

scoverage · Nov 12, 2024 · d54aa05 · d54aa05
1 parent 936f7c9
commit d54aa05
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage</groupId>
     <artifactId>scoverage-maven-plugin</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>SCoverage Maven Plugin</name>
@@ -94,8 +94,8 @@ under the License.
 
         <maven.version>3.9.9</maven.version>
         <maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version>
-        <maven-reporting-api.version>3.1.1</maven-reporting-api.version>
-        <doxia.version>1.11.1</doxia.version>
+        <maven-reporting-api.version>4.0.0</maven-reporting-api.version>
+        <doxia.version>2.0.0</doxia.version>
 
         <scalac-scoverage-plugin.version>2.2.1</scalac-scoverage-plugin.version>
         <scalac-scoverage-plugin.scala.version>2.13</scalac-scoverage-plugin.scala.version>

diff --git a/src/it/integration_tests_parent/pom.xml b/src/it/integration_tests_parent/pom.xml
@@ -21,7 +21,7 @@
         <scala.plugin.version>4.9.1</scala.plugin.version>
         <scalatest.plugin.version>2.0.0</scalatest.plugin.version>
         <project-info-reports.plugin.version>3.5.0</project-info-reports.plugin.version>
-        <site.plugin.version>3.12.1</site.plugin.version>
+        <site.plugin.version>3.21.0</site.plugin.version>
 
         <scala.compat.version>2.13</scala.compat.version>
         <scala.minor.version>14</scala.minor.version>

diff --git a/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java b/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
@@ -29,7 +29,8 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.maven.doxia.siterenderer.RenderingContext;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.DocumentRenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 
 import org.apache.maven.execution.MavenSession;
@@ -43,7 +44,6 @@
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
 
-import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 import scala.Option;
@@ -206,7 +206,6 @@ public String getDescription( Locale locale )
 
     /** {@inheritDoc} */
     @Override
-    @SuppressWarnings( "deprecation" )
     public void generate( Sink sink, Locale locale )
         throws MavenReportException
     {
@@ -261,8 +260,16 @@ public void generate( Sink sink, Locale locale )
     }
 
     /** {@inheritDoc} */
+    @SuppressWarnings( "deprecation" ) // it's deprecated and abstract, so we have no choice, but to keep it
     @Override
     public String getOutputName()
+    {
+        return getOutputPath();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getOutputPath()
     {
         return destDir + "/index";
     }
@@ -388,7 +395,7 @@ public void execute()
 
         try
         {
-            RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html", null );
+            DocumentRenderingContext context = new DocumentRenderingContext( outputDirectory, getOutputName() + ".html", null );
             SiteRendererSink sink = new SiteRendererSink( context );
             Locale locale = Locale.getDefault();
             generate( sink, locale );
@@ -496,7 +503,7 @@ private void generateAggregatedReports()
                                 String path = r.readLine();
                                 while ( path != null )
                                 {
-                                    sourceRoots.add( new File( path ) );
+                                    sourceRoots.add(new File(path));
                                     path = r.readLine();
                                 }
                             }

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -22,7 +22,7 @@ under the License.
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>2.0.0-M10</version>
+        <version>2.0.0</version>
     </skin>
 
     <bannerLeft name="SCoverage Maven Plugin"/>