[maven-javadoc-plugin] branch MJAVADOC-705 updated (58e3752 -> 4e1ad04)

[mi...@apache.org]

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

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


 discard 58e3752  [MJAVADOC-705] Upgrade Maven Reporting API to 3.1.0
     new 4e1ad04  [MJAVADOC-705] Upgrade Maven Reporting API to 3.1.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (58e3752)
            \
             N -- N -- N   refs/heads/MJAVADOC-705 (4e1ad04)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

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

[mi...@apache.org]

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 4e1ad0476fbad8d5a7937886be4c1b8f61c108f8
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..bea4053 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-SNAPSHOT</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 )