You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/02/06 02:09:30 UTC

[maven-javadoc-plugin] 01/01: [MJAVADOC-705] Upgrade Maven Reporting API to 3.1.0

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

michaelo pushed a commit to branch MJAVADOC-705
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 5af4519ce17308f35d4cfb553d0af8168cac35f4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 25 10:51:20 2022 +0100

    [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 +-
 src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c99c94a..e7414db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
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 545e2ff..9832839 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.Map;
 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.Parameter;
 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 class JavadocReport
         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 )