Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 19520)
+++ /trunk/build.xml	(revision 19521)
@@ -42,17 +42,4 @@
         <property name="ivy.jar.dir" location="${tools.dir}/ivy"/>
         <property name="ivy.jar.file" location="${ivy.jar.dir}/ivy-${ivy.version}.jar"/>
-        <condition property="versions.jmockit" value="1.50" else="1.49.a">
-            <isset property="isJava17"/>
-        </condition>
-        <condition property="versions.checkstyle" value="13.2.0">
-            <isset property="isJava21"/>
-        </condition>
-        <!-- does not override previous value for Java >= 21 -->
-        <condition property="versions.checkstyle" value="12.3.1" else="10.26.1">
-            <isset property="isJava17"/>
-        </condition>
-        <condition property="versions.equalsverifier" value="4.3.1" else="3.19.4">
-            <isset property="isJava17"/>
-        </condition>
         
         <mkdir dir="${ivy.jar.dir}"/>
Index: /trunk/ivysettings.xml
===================================================================
--- /trunk/ivysettings.xml	(revision 19520)
+++ /trunk/ivysettings.xml	(revision 19521)
@@ -6,6 +6,18 @@
     <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/repository/public/" />
   </resolvers>
-  <!-- Remove junit5-system-exit specific statements in build.xml when we drop Java 11 as a build platform -->
+
+  <!-- Remove specific statements in build.xml when we drop older Java as a build platform -->
+
   <property name="versions.junit5-system-exit" value="1.1.2" unlessset="isJava17"/>
   <property name="versions.junit5-system-exit" value="2.0.2" ifset="isJava17"/>
+  
+  <property name="versions.checkstyle" value="10.26.1" unlessset="isJava17"/>
+  <property name="versions.checkstyle" value="12.3.1" unlessset="isJava21" ifset="isJava17"/>
+  <property name="versions.checkstyle" value="13.2.0" ifset="isJava21"/>
+
+  <property name="versions.jmockit" value="1.49.a" unlessset="isJava17"/>
+  <property name="versions.jmockit" value="1.50" ifset="isJava17"/>
+
+  <property name="versions.equalsverifier" value="3.19.4" unlessset="isJava17"/>
+  <property name="versions.equalsverifier" value="4.3.1" ifset="isJava17"/>
 </ivysettings>