[SCM] Cobertura Maven Plugin branch, master, updated. upstream/2.3+dfsg-23-g2230c2c
The following commit has been merged in the master branch: commit 2230c2cb0d41d21f280422f82bdc79b0bed81b6f Author: Miguel Landaeta mig...@miguel.cc Date: Sat Jan 14 21:27:12 2012 -0430 Add Build-Depends on libsurefire-java diff --git a/debian/changelog b/debian/changelog index 21274e7..8ad1f82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ cobertura-maven-plugin (2.3+dfsg-2) UNRELEASED; urgency=low * Team upload. - * Add Build-Depends on libmaven-plugin-tools-java. (Closes: #643498). + * Add Build-Depends on libmaven-plugin-tools-java and +libsurefire-java (= 2.10). (Closes: #643498). +Thanks to Daniel Schepler for the help to fix this bug. * Bump Standards-Version to 3.9.2. No changes were required. * Make copyright file DEP-5 compliant. - -- Miguel Landaeta mig...@miguel.cc Sat, 22 Oct 2011 20:00:39 -0430 + -- Miguel Landaeta mig...@miguel.cc Sat, 14 Jan 2012 21:13:00 -0430 cobertura-maven-plugin (2.3+dfsg-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b738010..3b6ea9e 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,8 @@ Maintainer: Debian Java Maintainers pkg-java-maintain...@lists.alioth.debian.or Uploaders: Gabriele Giacone 1o5g4...@gmail.com Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper Build-Depends-Indep: libcobertura-java, junit, libhttpunit-java, libgetopt-java, - libmaven-plugin-testing-java, libmaven-plugin-tools-java + libmaven-plugin-testing-java, libmaven-plugin-tools-java, + libsurefire-java (= 2.10) Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/pkg-java/cobertura-maven-plugin.git Vcs-Browser: http://git.debian.org/?p=pkg-java/cobertura-maven-plugin.git diff --git a/debian/maven.rules b/debian/maven.rules index e66c979..6cd8e43 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,3 +1,4 @@ +org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.10/ junit junit jar s/.*/3.x/ * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * s/urbanophile/gnu-getopt/ s/java-getopt/getopt jar s/.*/debian/ * -- Cobertura Maven Plugin ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Cobertura Maven Plugin branch, master, updated. upstream/2.3+dfsg-23-g2230c2c
The following commit has been merged in the master branch: commit afcc8d0083ccbd817b4b0577064181ed92affeec Author: Miguel Landaeta mig...@miguel.cc Date: Sat Jan 14 21:26:19 2012 -0430 Add previously uncommitted patch diff --git a/debian/patches/CoberturaReportMojo.java.diff b/debian/patches/CoberturaReportMojo.java.diff new file mode 100644 index 000..ef74a92 --- /dev/null +++ b/debian/patches/CoberturaReportMojo.java.diff @@ -0,0 +1,45 @@ +From: Gabriele Giacone 1o5g4...@gmail.com +Subject: [PATCH] CoberturaReportMojo.java + +Replaces org.codehaus.doxia.site.renderer.SiteRenderer +with import org.apache.maven.doxia.siterenderer.Renderer + +Signed-off-by: Gabriele Giacone 1o5g4...@gmail.com + +--- + .../mojo/cobertura/CoberturaReportMojo.java|6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java b/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java +index 562c7a6..8c6ffe6 100644 +--- a/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java b/src/main/java/org/codehaus/mojo/cobertura/CoberturaReportMojo.java +@@ -29,7 +29,7 @@ import org.apache.maven.project.MavenProject; + import org.apache.maven.reporting.AbstractMavenReport; + import org.apache.maven.reporting.MavenReportException; + import org.codehaus.doxia.sink.Sink; +-import org.codehaus.doxia.site.renderer.SiteRenderer; ++import org.apache.maven.doxia.siterenderer.Renderer; + import org.codehaus.mojo.cobertura.tasks.ReportTask; + + /** +@@ -106,7 +106,7 @@ public class CoberturaReportMojo + * + * @component + */ +-private SiteRenderer siteRenderer; ++private Renderer siteRenderer; + + /** + * iMaven Internal/i: Project to interact with. +@@ -152,7 +152,7 @@ public class CoberturaReportMojo + /** + * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer() + */ +-protected SiteRenderer getSiteRenderer() ++protected Renderer getSiteRenderer() + { + return siteRenderer; + } +-- +tg: (8d8bb01..) CoberturaReportMojo.java (depends on: build) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..37dd350 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +CoberturaReportMojo.java.diff -p1 -- Cobertura Maven Plugin ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits