package src:antlr-maven-plugin tags 643492 + patch thanks Here's a patch I used locally to get antlr-maven-plugin to build again -- the patch is based on the current code in maven-javadoc-plugin. I also noticed that the build was using quilt even though the source package is in 3.0 (quilt) format, so I fixed that while I was at it.
I verified that antlr3 builds against my package, and checkstyle builds until it runs into #652232 (and I did see the antlr plugin running successfully in that build). I couldn't check libhibernate3-java in my current pbuildd environment, but it looks like that FTBFS anyway, according to #653521. -- Daniel Schepler
diff -urN antlr-maven-plugin-2.1.old/debian/control antlr-maven-plugin-2.1/debian/control --- antlr-maven-plugin-2.1.old/debian/control 2010-05-19 20:30:47.000000000 +0000 +++ antlr-maven-plugin-2.1/debian/control 2012-01-10 16:58:13.000000000 +0000 @@ -3,13 +3,14 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>, Torsten Werner <twer...@debian.org> -Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk, maven-debian-helper (>> 0.7) +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>> 0.7) Build-Depends-Indep: libmaven-antrun-plugin-java (>= 1.3), libmaven-clean-plugin-java (>= 2.3), libmaven-compiler-plugin-java (>= 2.0.2), libmaven-invoker-plugin-java (>= 1.3), libmaven-jar-plugin-java (>= 2.2), libmaven-resources-plugin-java (>= 2.3), libmaven-site-plugin-java (>= 2.0), libmodello-maven-plugin-java (>= 1.1), libsurefire-java (>= 2.4.3), libmaven-reporting-impl-java, libmaven2-core-java, - libplexus-i18n-java, libplexus-utils-java, libwagon-java + libplexus-i18n-java, libplexus-utils-java, libwagon-java, + libmaven-plugin-tools-java Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr-maven-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr-maven-plugin/ diff -urN antlr-maven-plugin-2.1.old/debian/patches/modello-1.1.patch antlr-maven-plugin-2.1/debian/patches/modello-1.1.patch --- antlr-maven-plugin-2.1.old/debian/patches/modello-1.1.patch 2010-01-31 19:17:33.000000000 +0000 +++ antlr-maven-plugin-2.1/debian/patches/modello-1.1.patch 2012-01-10 16:58:27.000000000 +0000 @@ -1,5 +1,7 @@ ---- a/pom.xml -+++ b/pom.xml +Index: antlr-maven-plugin-2.1/pom.xml +=================================================================== +--- antlr-maven-plugin-2.1.orig/pom.xml 2008-03-06 21:57:20.000000000 +0000 ++++ antlr-maven-plugin-2.1/pom.xml 2012-01-10 16:08:31.000000000 +0000 @@ -151,7 +151,7 @@ </executions> <configuration> @@ -16,29 +18,27 @@ -</project> \ No newline at end of file +</project> ---- a/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java -+++ b/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java -@@ -26,13 +26,13 @@ +Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java +=================================================================== +--- antlr-maven-plugin-2.1.orig/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2008-02-25 08:31:17.000000000 +0000 ++++ antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2012-01-10 16:58:24.000000000 +0000 +@@ -25,8 +25,8 @@ + import java.util.List; import java.util.Locale; ++import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.siterenderer.Renderer; -import org.apache.maven.doxia.siterenderer.RendererException; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; - import org.apache.maven.reporting.AbstractMavenReportRenderer; - import org.apache.maven.reporting.MavenReport; - import org.apache.maven.reporting.MavenReportException; -+import org.apache.maven.reporting.sink.SinkFactory; - import org.apache.maven.wagon.PathUtils; - import org.codehaus.doxia.sink.Sink; - import org.codehaus.plexus.i18n.I18N; -@@ -218,20 +218,10 @@ +@@ -218,20 +218,11 @@ { try { - SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); -+ SiteRendererSink sink = SinkFactory.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); ++ RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" ); ++ SiteRendererSink sink = new SiteRendererSink( context ); generate( sink, Locale.getDefault() ); } @@ -55,8 +55,10 @@ catch ( MavenReportException e ) { throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) ---- a/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java -+++ b/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java +Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java +=================================================================== +--- antlr-maven-plugin-2.1.orig/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java 2008-02-25 08:31:17.000000000 +0000 ++++ antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java 2012-01-10 16:08:31.000000000 +0000 @@ -82,7 +82,7 @@ /** * The maven project's helper. diff -urN antlr-maven-plugin-2.1.old/debian/rules antlr-maven-plugin-2.1/debian/rules --- antlr-maven-plugin-2.1.old/debian/rules 2010-01-31 19:17:33.000000000 +0000 +++ antlr-maven-plugin-2.1/debian/rules 2012-01-10 16:58:13.000000000 +0000 @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java diff -urN antlr-maven-plugin-2.1.old/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java --- antlr-maven-plugin-2.1.old/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2012-01-10 16:08:31.000000000 +0000 +++ antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2012-01-10 16:58:24.000000000 +0000 @@ -25,6 +25,7 @@ import java.util.List; import java.util.Locale; +import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; @@ -32,7 +33,6 @@ import org.apache.maven.reporting.AbstractMavenReportRenderer; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; -import org.apache.maven.reporting.sink.SinkFactory; import org.apache.maven.wagon.PathUtils; import org.codehaus.doxia.sink.Sink; import org.codehaus.plexus.i18n.I18N; @@ -218,7 +218,8 @@ { try { - SiteRendererSink sink = SinkFactory.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); + RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" ); + SiteRendererSink sink = new SiteRendererSink( context ); generate( sink, Locale.getDefault() ); }
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.
