[icu4j-49] 04/06: Fixed the build failure with Java 9 (Closes: #893179)

[Emmanuel Bourg]

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

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

commit 48d80c71fceb30e9374a1f357b1c58231ba5bb61
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 25 23:44:50 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893179)
---
 debian/changelog                         |  1 +
 debian/patches/java9-compatibility.patch | 20 ++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d6690b1..e2edb94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 icu4j-49 (49.1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893179)
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
 
diff --git a/debian/patches/java9-compatibility.patch b/debian/patches/java9-compatibility.patch
new file mode 100644
index 0000000..7154305
--- /dev/null
+++ b/debian/patches/java9-compatibility.patch
@@ -0,0 +1,20 @@
+Description: Fixes the detection of the JDK to allow the compilation with Java 9 and later.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -44,13 +44,7 @@
+     <property name="doc.dir" value="doc"/>
+ 
+     <!-- Java version check -->
+-    <condition property="is.java6.plus">
+-        <or>
+-            <contains string="${java.version}" substring="1.6."/>
+-            <contains string="${java.version}" substring="1.7."/>
+-            <contains string="${java.version}" substring="1.8."/>
+-        </or>
+-    </condition>
++    <property name="is.java6.plus" value="true"/>
+     <condition property="is.java5">
+         <contains string="${java.version}" substring="1.5."/>
+     </condition>
diff --git a/debian/patches/series b/debian/patches/series
index 304222e..d9a20ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-osgi-metadata.patch
+java9-compatibility.patch

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