[jericho-html] 01/04: Fixed the build failure with Java 9 (Closes: #893205)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Apr 9 23:43:30 UTC 2018


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

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

commit 32a397d0222556ac88263702fe3d1053a7ee1e76
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 10 01:39:54 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893205)
---
 debian/ant.properties | 6 ++----
 debian/build.xml      | 4 ++--
 debian/changelog      | 7 +++++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index a83eccb..b2546e0 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,6 +1,4 @@
 jarfile=jericho-html.jar
-# Ensure that source and target are 1.5
-# For backwards compat on Java 7
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.8
+ant.build.javac.target=1.8
 
diff --git a/debian/build.xml b/debian/build.xml
index 654cd2f..4e5a4c0 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -6,7 +6,7 @@
   <target name="build"
     description="build the jar file">
     <mkdir dir="build"/>
-    <javac srcdir="src" destdir="build">
+    <javac srcdir="src" destdir="build" encoding="ISO-8859-1">
       <classpath>
         <pathelement location="/usr/share/java/commons-logging.jar"/>
         <pathelement location="/usr/share/java/log4j-1.2.jar"/>
@@ -20,7 +20,7 @@
     description="build the samples">
     <mkdir dir="samples/CommandLine/bin"/>
     <javac srcdir="samples/CommandLine/src" destdir="samples/CommandLine/bin"
-      classpath="${jarfile}"/>
+      classpath="${jarfile}" encoding="ISO-8859-1"/>
   </target>
 
   <target name="runsample" depends="buildsamples"
diff --git a/debian/changelog b/debian/changelog
index c02177d..e8cb9a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jericho-html (3.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893205)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Apr 2018 01:39:10 +0200
+
 jericho-html (3.2-1) unstable; urgency=medium
 
   * Team upload.

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



More information about the pkg-java-commits mailing list