From 2c202e9c959b0350f0b5e37b06713b6b8c845e51 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 20 Aug 2018 21:41:40 +0200
Subject: Fix version match, and remove debug echos java.version contains
 1.8.0_131 where ant.java.version only contains 1.8

---
 build.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 17a9775d..c9411d7e 100644
--- a/build.xml
+++ b/build.xml
@@ -162,20 +162,9 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	</target>
 	
 	<target name="-ensureJdk9">
-		<echo message="Java version: ${java.version}" />
-
 		<condition property="java.version.insufficient">
-			<or>
-				<equals arg1="${java.version}" arg2="1.2" />
-				<equals arg1="${java.version}" arg2="1.3" />
-				<equals arg1="${java.version}" arg2="1.4" />
-				<equals arg1="${java.version}" arg2="1.5" />
-				<equals arg1="${java.version}" arg2="1.6" />
-				<equals arg1="${java.version}" arg2="1.7" />
-				<equals arg1="${java.version}" arg2="1.8" />
-			</or>
+			<matches string="${java.version}" pattern="^1\.[2-8](\..*)?" />
 		</condition>
-		<echo message="Java version insufficient: ${java.version.insufficient}" />
 		<fail if="java.version.insufficient">To compile lombok, you need JDK9 or higher; lombok requires this version because it's rather difficult to produce lombok builds that are compatible on JDK9 without at least building with JDK9. Sorry about that.</fail>
 	</target>
 	
-- 
cgit