Changeset 19517 in josm

Timestamp:

2026-02-12T08:35:23+01:00 (17 hours ago)

Author:

stoecker

Message:

update tools

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (1 diff)
• tools/ivy.xml (modified) (1 diff)

trunk/build.xml

@@ -33 +33 @@
         <!-- <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 +45 @@
             <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 +126 @@
             <isset property="clevel"/>
         </condition>
+        <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
         <condition property="coverageByDefault">
             <not>

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -750 +750 @@
         void makeVisible(int index, Layer layer);
 
-
         /**
          * Fired when something has changed in the layer list model.

trunk/tools/ivy.xml

@@ -17 +17 @@
         <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.13" conf="javacc->default"/>
         <!-- checkstyle->default -->
-        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.21.2" conf="checkstyle->default"/>
+        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="${versions.checkstyle}" conf="checkstyle->default"/>
         <!-- proguard->default -->
-        <dependency org="com.guardsquare" name="proguard-ant" rev="7.6.1" conf="proguard->default"/>
+        <dependency org="com.guardsquare" name="proguard-ant" rev="7.8.2" conf="proguard->default"/>
         <!-- pmd->default -->
-        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.10.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.10.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.10.0" conf="pmd->default"/>
-        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.12" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.21.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.21.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.21.0" conf="pmd->default"/>
+        <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.21" conf="pmd->default"/>
         <!-- spotbugs->default -->
-        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.9.0" conf="spotbugs->default"/>
-        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.9.0" conf="spotbugs->default"/>
+        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.9.8" conf="spotbugs->default"/>
+        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.9.8" conf="spotbugs->default"/>
         <!-- errorprone->default -->
         <dependency org="com.google.errorprone" name="error_prone_core" rev="2.47.0" conf="errorprone->default"/>
         <!-- animal->default -->
-        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.27" conf="animal->default"/>
     </dependencies>
 </ivy-module>