aboutsummaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorRoel Spilker <r.spilker@gmail.com>2018-08-20 21:41:40 +0200
committerRoel Spilker <r.spilker@gmail.com>2018-08-20 21:43:29 +0200
commit2c202e9c959b0350f0b5e37b06713b6b8c845e51 (patch)
tree9424684bd0c6e4c7d1067047b234a00f7e41d2fa /build.xml
parent747347793df1608b3f0f37a09fab8418535a170d (diff)
downloadlombok-2c202e9c959b0350f0b5e37b06713b6b8c845e51.tar.gz
lombok-2c202e9c959b0350f0b5e37b06713b6b8c845e51.tar.bz2
lombok-2c202e9c959b0350f0b5e37b06713b6b8c845e51.zip
Fix version match, and remove debug echos
java.version contains 1.8.0_131 where ant.java.version only contains 1.8
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml13
1 files changed, 1 insertions, 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>