[excalibur-logkit] 31/32: Fixed the build failure with Java 9 (Closes: #893145)

[Emmanuel Bourg]

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

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

commit 6a805a6ce2cd4155e6f9a3d5748376f6679890f9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 29 01:24:58 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893145)
---
 debian/changelog                        |  1 +
 debian/patches/05_source_encoding.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6a3038..926c7b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 excalibur-logkit (2.0-12) UNRELEASED; urgency=medium
 
+  * Fixed the build failure with Java 9 (Closes: #893145)
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
diff --git a/debian/patches/05_source_encoding.patch b/debian/patches/05_source_encoding.patch
new file mode 100644
index 0000000..b97f8f1
--- /dev/null
+++ b/debian/patches/05_source_encoding.patch
@@ -0,0 +1,32 @@
+Description: Set the source encoding to fix the build failure with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -31,7 +31,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="ISO-8859-1">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -169,7 +169,7 @@
+   <target name="compile-tests" depends="compile">
+     <mkdir dir="${testclassesdir}">
+     </mkdir>
+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="ISO-8859-1">
+       <src>
+         <pathelement location="src/test">
+         </pathelement>
+@@ -195,7 +195,7 @@
+     </property>
+     <property name="title" value="Avalon LogKit 2.0.dev-0 API">
+     </property>
+-    <javadoc bottom="Copyright &copy; 2003-2004 The Apache Software Foundation. All Rights Reserved." use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.log.*">
++    <javadoc bottom="Copyright &copy; 2003-2004 The Apache Software Foundation. All Rights Reserved." use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.log.*" encoding="ISO-8859-1">
+       <classpath>
+         <fileset dir="${libdir}">
+           <include name="*.jar">
diff --git a/debian/patches/series b/debian/patches/series
index 1876730..b1ba447 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix_build_xml.patch
 03_add_constructor.patch
 04_disable_unit_test.patch
+05_source_encoding.patch

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