[Git][java-team/antlr-maven-plugin][master] Fixed the compatibility with doxia 2.0

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / antlr-maven-plugin


Commits:
b8a5dd26 by Emmanuel Bourg at 2024-10-24T14:22:55+02:00
Fixed the compatibility with doxia 2.0

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/doxia-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+antlr-maven-plugin (2.2-7) unstable; urgency=medium
+
+  * Fixed the compatibility with doxia 2.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 24 Oct 2024 14:18:23 +0200
+
 antlr-maven-plugin (2.2-6) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
  libmaven-antrun-plugin-java (>= 1.3),
  libmaven-invoker-plugin-java (>= 1.3),
  libmaven-plugin-tools-java,
- libmaven-reporting-impl-java,
+ libmaven-reporting-impl-java (>= 4.0.0),
  libmaven-resources-plugin-java (>= 2.3),
  libmaven3-core-java,
  libmodello-maven-plugin-java (>= 1.1),


=====================================
debian/patches/doxia-compatibility.patch
=====================================
@@ -0,0 +1,32 @@
+Description: Fix the compatibility with the version of Doxia in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
++++ b/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
+@@ -25,7 +25,7 @@
+ import java.util.List;
+ import java.util.Locale;
+ 
+-import org.apache.maven.doxia.siterenderer.RenderingContext;
++import org.apache.maven.doxia.siterenderer.DocumentRenderingContext;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.MojoExecutionException;
+@@ -34,7 +34,7 @@
+ import org.apache.maven.reporting.MavenReport;
+ import org.apache.maven.reporting.MavenReportException;
+ import org.apache.maven.wagon.PathUtils;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.codehaus.plexus.i18n.I18N;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.StringUtils;
+@@ -217,7 +217,7 @@
+     {
+         try
+         {
+-            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
++            DocumentRenderingContext context = new DocumentRenderingContext( getReportOutputDirectory(), getOutputName() + ".html", null );
+             SiteRendererSink sink = new SiteRendererSink( context );
+ 
+             generate( sink, Locale.getDefault() );


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 null-options-check.patch
 modello-1.1.patch
 catch-security-manager-exception.patch
+doxia-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/antlr-maven-plugin/-/commit/b8a5dd26e89bb246ca85b5d28f43a0208aaf319b

-- 
View it on GitLab: https://salsa.debian.org/java-team/antlr-maven-plugin/-/commit/b8a5dd26e89bb246ca85b5d28f43a0208aaf319b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20241024/ba246d69/attachment.htm>