[jakarta-jmeter] 02/02: Fixed an error with libxstream-java >= 1.4.9 when loading the templates

[Emmanuel Bourg]

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

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

commit c1bffc32d3de12ead2687f013b4f19d28cbaa9a2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 30 23:17:58 2016 +0200

    Fixed an error with libxstream-java >= 1.4.9 when loading the templates
---
 debian/changelog                              |  1 +
 debian/patches/10_xstream-compatibility.patch | 13 +++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5dd2f2b..65640e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ jakarta-jmeter (2.13-1) UNRELEASED; urgency=medium
     - Fixed the compatibility with libhttpclient-java (>= 4.3)
     - No longer install ApacheJMeter_report.jar (removed)
   * Install the templates (Closes: #795356)
+  * Fixed an error with libxstream-java >= 1.4.9 when loading the templates
   * Moved the package to Git
   * Standards-Version updated to 3.9.7 (no changes)
 
diff --git a/debian/patches/10_xstream-compatibility.patch b/debian/patches/10_xstream-compatibility.patch
new file mode 100644
index 0000000..e73150a
--- /dev/null
+++ b/debian/patches/10_xstream-compatibility.patch
@@ -0,0 +1,13 @@
+Description: Remove the DOCTYPE to fix an error with XStream >= 1.4.9 (external entities are disabled)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/bin/templates/templates.xml
++++ b/bin/templates/templates.xml
+@@ -18,7 +18,6 @@
+ <!-- 
+     See the DTD for allowable elements and attributes.
+  -->
+-<!DOCTYPE templates SYSTEM "templates.dtd">
+ <templates>
+     <template isTestPlan="true">
+         <name>Recording</name>
diff --git a/debian/patches/series b/debian/patches/series
index 721168c..c8a6047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 07_ignore-tika.patch
 08_bouncycastle-1.51.patch
 09_httpcomponents-compatibility.patch
+10_xstream-compatibility.patch

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