diff --git a/pom.xml b/pom.xml
index 98517ddc..197fd2a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
4.0.0
org.scoverage
scoverage-maven-plugin
- 2.0.7-SNAPSHOT
+ 2.1.0-SNAPSHOT
maven-plugin
SCoverage Maven Plugin
@@ -94,8 +94,8 @@ under the License.
3.9.9
3.15.1
- 3.1.1
- 1.11.1
+ 4.0.0
+ 2.0.0
2.2.1
2.13
diff --git a/src/it/integration_tests_parent/pom.xml b/src/it/integration_tests_parent/pom.xml
index 587294da..a97eda34 100644
--- a/src/it/integration_tests_parent/pom.xml
+++ b/src/it/integration_tests_parent/pom.xml
@@ -21,7 +21,7 @@
4.9.1
2.0.0
3.5.0
- 3.12.1
+ 3.21.0
2.13
14
diff --git a/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java b/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
index 1978be42..ff7fee12 100644
--- 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
index 5c9f09f2..6ef38e48 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.maven.skins
maven-fluido-skin
- 2.0.0-M10
+ 2.0.0