[surefire] 02/04: Fixed the build failure caused by the Doxia upgrade (Closes: #871112)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository surefire.

commit d5a13a9afc56e91711bca95b747e1f153e6c6d99
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 3 22:24:16 2017 +0200

    Fixed the build failure caused by the Doxia upgrade (Closes: #871112)
---
 debian/changelog                         |  1 +
 debian/patches/doxia-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0611dd5..db733d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 surefire (2.19.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure caused by the Doxia upgrade (Closes: #871112)
   * Standards-Version updated to 4.1.0
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 03 Sep 2017 22:02:36 +0200
diff --git a/debian/patches/doxia-compatibility.patch b/debian/patches/doxia-compatibility.patch
new file mode 100644
index 0000000..34cb42a
--- /dev/null
+++ b/debian/patches/doxia-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Doxia in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
++++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+@@ -27,7 +27,7 @@
+ import java.util.ResourceBundle;
+ import org.apache.maven.doxia.markup.HtmlMarkup;
+ import org.apache.maven.doxia.sink.Sink;
+-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
++import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
+ import org.apache.maven.doxia.sink.SinkEventAttributes;
+ import org.apache.maven.doxia.util.DoxiaUtils;
+ import org.apache.maven.reporting.MavenReportException;
diff --git a/debian/patches/series b/debian/patches/series
index 044dc1e..d4647db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix-junit-provider-selection.patch
 bypass-testng-version-check.patch
 dependency-plugin-configuration.patch
 surefire-execution-parameters-compatibility.patch
+doxia-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git