From 5af4519ce17308f35d4cfb553d0af8168cac35f4 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 25 Jan 2022 10:51:20 +0100 Subject: [PATCH] [MJAVADOC-705] Upgrade Maven Reporting API to 3.1.0 Move to new API signature, but maintain old binary compatibility. This, in general, can be avoided by extending AbstractMavenReport. This closes #120 --- pom.xml | 2 +- .../org/apache/maven/plugins/javadoc/JavadocReport.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c99c94a95..e7414db0f 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ under the License. org.apache.maven.reporting maven-reporting-api - 3.0 + 3.1.0 org.apache.maven diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java index 545e2ff9e..98328391d 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java @@ -27,6 +27,7 @@ import java.util.ResourceBundle; import java.util.stream.Collectors; +import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.siterenderer.RenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; @@ -38,7 +39,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; -import org.codehaus.doxia.sink.Sink; import org.codehaus.plexus.util.StringUtils; /** @@ -123,6 +123,12 @@ public String getDescription( Locale locale ) return description; } + public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale ) + throws MavenReportException + { + generate( (Sink) sink, locale ); + } + /** {@inheritDoc} */ @Override public void generate( Sink sink, Locale locale )