Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade doxia to 2.0.0 maven-reporting-api to 4.0.0 #321

Closed
wants to merge 1 commit into from
Closed

Upgrade doxia to 2.0.0 maven-reporting-api to 4.0.0 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ under the License.

<maven.version>3.9.9</maven.version>
<maven-plugin-plugin.version>3.15.0</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>
Expand Down Expand Up @@ -273,9 +273,9 @@ under the License.
<subpackages>org.scoverage.plugin</subpackages>
<links>
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
<link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
<link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
</links>
<notimestamp>true</notimestamp>
</configuration>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -206,7 +206,6 @@ public String getDescription( Locale locale )

/** {@inheritDoc} */
@Override
@SuppressWarnings( "deprecation" )
public void generate( Sink sink, Locale locale )
throws MavenReportException
{
Expand Down Expand Up @@ -388,7 +387,7 @@ public void execute()

try
{
RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
DocumentRenderingContext context = new DocumentRenderingContext( outputDirectory, getOutputName() + ".html", null );
SiteRendererSink sink = new SiteRendererSink( context );
Locale locale = Locale.getDefault();
generate( sink, locale );
Expand Down
Loading