pool/antlr-maven-plugin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1208219 from Java:packages

Browse Source 
port to changes in maven-doxia-sitetools 2.0.0

OBS-URL: https://build.opensuse.org/request/show/1208219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr-maven-plugin?expand=0&rev=7
This commit is contained in:
Ana Guerrero 2024-10-16 21:47:00 +00:00 committed by Git OBS Bridge
commit 7253f80b79
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
antlr-maven-plugin.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 2 10:25:40 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* maven-antlr-plugin-2.1-sinkfix.patch
* new-reporting-api.patch
+ port to changes in maven-doxia-sitetools 2.0.0 milestones
-------------------------------------------------------------------
Tue Feb 20 10:57:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

2
antlr-maven-plugin.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package antlr-maven-plugin
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

4
maven-antlr-plugin-2.1-sinkfix.patch
View File

@ -4,7 +4,7 @@
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.RenderingContext;
+import org.apache.maven.doxia.siterenderer.DocumentRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@ -13,7 +13,7 @@
try
{
- SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+ RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
+ DocumentRenderingContext context = new DocumentRenderingContext( getReportOutputDirectory(), getOutputName() + ".html", null );
+ SiteRendererSink sink = new SiteRendererSink( context );
generate( sink, Locale.getDefault() );

27
new-reporting-api.patch
View File

@ -1,15 +1,20 @@
--- antlr-maven-plugin-2.2/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2010-11-16 16:59:34.000000000 +0100
+++ antlr-maven-plugin-2.2/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2022-03-10 21:12:43.366027036 +0100
@@ -128,6 +128,12 @@
arguments.add( "-html" );
--- antlr-maven-plugin-2.2/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2024-10-02 11:40:33.269689821 +0200
+++ antlr-maven-plugin-2.2/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2024-10-02 11:42:56.144065975 +0200
@@ -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;
@@ -129,7 +129,7 @@
}
+ public void generate(
+ final org.apache.maven.doxia.sink.Sink sink,
+ final Locale locale) throws MavenReportException {
+ generate( (Sink) sink, locale);
+ }
+
/**
* @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, java.util.Locale)
- * @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, java.util.Locale)
+ * @see org.apache.maven.reporting.MavenReport#generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)
*/
public void generate( Sink sink, Locale locale )
throws MavenReportException