Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 19516)
+++ trunk/build.xml	(revision 19517)
@@ -33,5 +33,4 @@
         <!-- <condition property="isJava25"><matches string="${ant.java.version}" pattern="2[5-9]|[3-9][0-9]" /></condition> -->
         <!-- <condition property="isJava26"><matches string="${ant.java.version}" pattern="2[6-9]|[3-9][0-9]" /></condition> -->
-        <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
     </target>
     <target name="init-ivy" depends="init-javaversions" description="Initialize dependency management system Apache Ivy">
@@ -46,7 +45,15 @@
             <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}"/>
         <get src="https://josm.openstreetmap.de/repository/public/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"
@@ -119,4 +126,5 @@
             <isset property="clevel"/>
         </condition>
+        <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
         <condition property="coverageByDefault">
             <not>