Changeset 18726 in josm for trunk

Timestamp:

2023-05-11T18:32:20+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #22943: Build fails with Java 20

This was due the isJava9 regex using 1[0-9] for Java 10+.

File:

• trunk/build.xml (modified) (1 diff)

trunk/build.xml

@@ -93 +93 @@
         </condition>
         <!-- For Java specific stuff by version -->
-        <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
-        <condition property="isJava10"><matches string="${ant.java.version}" pattern="(1|2)[0-9]" /></condition>
+        <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|[2-9][0-9])" /></condition>
+        <condition property="isJava10"><matches string="${ant.java.version}" pattern="[1-9][0-9]" /></condition>
         <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
         <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|[2-9][0-9]" /></condition>