[httpunit] 03/04: Fixed the build failure with Java 9 (Closes: #893158)

[Emmanuel Bourg]

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

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

commit 9639ef643c820283d32ffdf7d9fec91ab536acdc
Author: Emmanuel Bourg <ebo...@apache.org>
Date:   Mon Mar 26 00:56:40 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893158)
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 +
 debian/patches/source-encoding.patch | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7af6358..e6a0947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ httpunit (1.7+dfsg-13) UNRELEASED; urgency=medium
   * Update copyright info.
 
   [ Emmanuel Bourg ]
+  * Fixed the build failure with Java 9 (Closes: #893158)
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
 
diff --git a/debian/patches/series b/debian/patches/series
index f3e5cce..674460e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ add_classpath_to_manifest
 remove-date-from-manifest.patch
 remove-timestamp-from-javadoc.patch
 servlet-api-compatibility.patch
+source-encoding.patch
diff --git a/debian/patches/source-encoding.patch 
b/debian/patches/source-encoding.patch
new file mode 100644
index 0000000..76ba355
--- /dev/null
+++ b/debian/patches/source-encoding.patch
@@ -0,0 +1,21 @@
+Description: Set the source encoding to fix the build failures with Java 9+
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -133,6 +133,7 @@
+ <target name="compile" 
depends="prepare,check_for_optional_packages,compile-for-java2">
+     <mkdir dir="${build.classes}" />
+     <javac srcdir="${src.dir}" destdir="${build.classes}"
++           encoding="ISO-8859-1"
+            debug="${debug}" deprecation="${deprecation}" 
optimize="${optimize}">
+         <classpath refid="base.classpath" />
+         <exclude name="**/JTidyHTMLParser.java" unless="jtidy.present" />
+@@ -257,6 +258,7 @@
+              destdir="${javadoc.dir}" author="true" version="true"
+              windowtitle="${Name} ${version} API" doctitle="${Name}"
+              additionalparam="-notimestamp"
++             encoding="ISO-8859-1"
+              footer="Copyright &amp;copy; 2000-2008 Russell Gold. See &lt;a 
target=&quot;_top&quot; href=&quot;../license.html&quot;&gt;license 
agreement&lt;/A&gt; for rights granted." >
+         <classpath refid="base.classpath"/>
+     </javadoc>

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits