ICU-13330 Fixed java version check for Java 9.

X-SVN-Rev: 40453

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 0d8fca411fe82874692c5af9457acca1aeee7c31..56ce4a076d40b812e8d8a54d80bb7e627b3335d3 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -86,52 +86,50 @@
     <property name="external-jars" value="lib"/>
 
     <!-- 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."/>
-            <contains string="${java.version}" substring="1.9."/>
-        </or>
-    </condition>
-    <fail message="The JDK version is too old or unknown.">
-        <condition>
-            <not>
-                <isset property="is.java6.plus"/>
-            </not>
-        </condition>
-    </fail>
-
     <condition property="is.java6">
-            <contains string="${java.version}" substring="1.6."/>
+        <matches string="${java.version}" pattern="1\.6\.\d.*"/>
     </condition>
 
     <condition property="is.java7">
-            <contains string="${java.version}" substring="1.7."/>
+        <matches string="${java.version}" pattern="1\.7\.\d.*"/>
     </condition>
 
     <condition property="is.java8">
-            <contains string="${java.version}" substring="1.8."/>
+        <matches string="${java.version}" pattern="1\.8\.\d.*"/>
     </condition>
 
     <condition property="is.java9">
-            <contains string="${java.version}" substring="1.9."/>
+        <matches string="${java.version}" pattern="9((-.|\.\d).*)?"/>
     </condition>
 
-    <condition property="is.java7.plus">
+    <condition property="is.java8.plus">
         <or>
-            <isset property="is.java7"/>
             <isset property="is.java8"/>
             <isset property="is.java9"/>
         </or>
     </condition>
 
-    <condition property="is.java8.plus">
+    <condition property="is.java7.plus">
         <or>
-            <isset property="is.java8"/>
-            <isset property="is.java9"/>
+            <isset property="is.java7"/>
+            <isset property="is.java8.plus"/>
+        </or>
+    </condition>
+
+    <condition property="is.java6.plus">
+        <or>
+            <isset property="is.java6"/>
+            <isset property="is.java7.plus"/>
         </or>
     </condition>
+    <fail message="The JDK version is too old or unknown.">
+        <condition>
+            <not>
+                <isset property="is.java6.plus"/>
+            </not>
+        </condition>
+    </fail>
+
 
     <!-- Build environment info -->
     <property name="env.COMPUTERNAME" value="${env.HOSTNAME}"/>
@@ -146,6 +144,10 @@
         <echo message="OS Arch:      ${os.arch}"/>
         <echo message="Host:         ${env.COMPUTERNAME}"/>
         <echo message="-------------------------------------------------------"/>
+    <echo message="is.java6: ${is.java6}"/>
+    <echo message="is.java7: ${is.java7}"/>
+    <echo message="is.java8: ${is.java8}"/>
+    <echo message="is.java9: ${is.java9}"/>
     </target>
 
     <target name="clean" description="Clean up build outputs">