[velocity-tools] 04/05: Fixed a source incompatibility with dom4j 2.x

[Emmanuel Bourg]

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

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

commit e8d7a0d3b55b22becc39ff08155d22f7494e9f72
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 14 00:39:56 2017 +0200

    Fixed a source incompatibility with dom4j 2.x
---
 debian/changelog                            |  1 +
 debian/patches/04_dom4j2_compatibility.diff | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db7572c..180f495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 velocity-tools (2.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed a source incompatibility with dom4j 2.x
   * Build with the DH sequencer instead of CDBS
   * Switch to debhelper level 10
   * Standards-Version updated to 4.1.1
diff --git a/debian/patches/04_dom4j2_compatibility.diff b/debian/patches/04_dom4j2_compatibility.diff
new file mode 100644
index 0000000..f88d2f7
--- /dev/null
+++ b/debian/patches/04_dom4j2_compatibility.diff
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with dom4j 2.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
++++ b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
+@@ -572,7 +572,7 @@
+         {
+             if (n instanceof Element)
+             {
+-                kids.addAll((List<Node>)((Element)n).elements());
++                kids.addAll((List)((Element)n).elements());
+             }
+         }
+         return new XmlTool(kids);
diff --git a/debian/patches/series b/debian/patches/series
index da71fc1..d65dfbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_dont_copy_test_lib.diff
 02_junit_45.diff
 03_servlet_api_compatibility.diff
+04_dom4j2_compatibility.diff

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