Dependency updates:

ivy.xml: * jmapviewer: 2.21 -> 2.22: Fix a NumberFormatException (fix #23888) * commons-compress: 1.27.0 -> 1.27.1 * tag2link: 2024.8.12 -> 2024.8.21 * commons-lang3: 3.16.0 -> 3.17.0 * classgraph: 4.8.174 -> 4.8.175 * junit: 5.10.3 -> 5.11.0: Repeatable `@..Source` annotations for parameterized tests * equalsverifier: 3.16.1 -> 3.16.2 tools/ivy.xml: * checkstyle: 10.17 -> 10.18: Better support for Java 21 * pmd: 7.4.0 -> 7.5.0 * errorprone: 2.30.0 -> 2.31.0: Note: this is the last planned release that supports running on Java 11. git-svn-id: https://josm.openstreetmap.de/svn/trunk@19208 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Sep 5, 2024 · d825ea6 · d825ea6
1 parent 33a6915
commit d825ea6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 39 deletions.
diff --git a/ivy.xml b/ivy.xml
@@ -20,35 +20,35 @@
     </configurations>
     <dependencies>
         <!-- api->default -->
-        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
+        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
         <dependency conf="api->default" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
         <!-- parsson is an implementation for jakarta.json -->
         <dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
-        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
+        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.27.1"/>
         <dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
         <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.10"/>
         <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0" transitive="false"/>
         <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
         <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.28.2"/>
         <!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
-        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.8.12"/>
+        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.8.21"/>
         <!-- sources->sources -->
-        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
+        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.22"/>
         <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
         <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.7"/>
         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2.1"/>
-        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
+        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.27.1"/>
         <dependency conf="sources->sources" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
         <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.10"/>
         <dependency conf="sources->sources" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0" transitive="false"/>
         <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.4"/>
         <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.28.2"/>
-        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2024.8.12"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
+        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2024.8.21"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
         <!-- commonslang->default -->
-        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
+        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
         <!-- jacocoant->default -->
         <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.12">
             <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
@@ -58,17 +58,17 @@
         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
         <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
         <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.9.1"/>
-        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.174"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.3"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.3"/>
-        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.3"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.3"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.3"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.3"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.3"/>
+        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.175"/>
+        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.11.0"/>
+        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.11.0"/>
+        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.11.0"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.11.0"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.11.0"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.11.0"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.11.0"/>
         <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
-        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.1"/>
-        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
+        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.16.2"/>
+        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
         <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.2"/>
     </dependencies>
 </ivy-module>
diff --git a/nodist/pom.xml b/nodist/pom.xml
@@ -11,15 +11,15 @@
         <project.reporting.outputEncoding>US-ASCII</project.reporting.outputEncoding>
         <java.lang.version>11</java.lang.version>
         <maven.compiler.release>${java.lang.version}</maven.compiler.release>
-        <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
-        <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
+        <maven.compiler.source>${java.lang.version}</maven.compiler.source>
+        <maven.compiler.target>${java.lang.version}</maven.compiler.target>
         <test.headless>true</test.headless>
         <sonar.host.url>https://josm.openstreetmap.de/sonar/</sonar.host.url>
         <sonar.projectKey>JOSM</sonar.projectKey>
         <jmockit.version>1.49.a</jmockit.version>
-        <pmd.version>7.4.0</pmd.version>
+        <pmd.version>7.5.0</pmd.version>
         <jacoco.version>0.8.12</jacoco.version>
-        <checkstyle.version>10.17.0</checkstyle.version>
+        <checkstyle.version>10.18.1</checkstyle.version>
         <spotbugs.version>4.8.6</spotbugs.version>
     </properties>
     <modules>
@@ -241,14 +241,14 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.3</version>
+                <version>5.11.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.openstreetmap.jmapviewer</groupId>
                 <artifactId>jmapviewer</artifactId>
-                <version>2.21</version>
+                <version>2.22</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -272,7 +272,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.27.0</version>
+                <version>1.27.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -315,7 +315,7 @@
             <dependency>
                 <groupId>org.webjars.npm</groupId>
                 <artifactId>tag2link</artifactId>
-                <version>2024.8.12</version>
+                <version>2024.8.21</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -345,7 +345,7 @@
             <dependency>
                 <groupId>io.github.classgraph</groupId>
                 <artifactId>classgraph</artifactId>
-                <version>4.8.174</version>
+                <version>4.8.175</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -357,13 +357,13 @@
             <dependency>
                 <groupId>nl.jqno.equalsverifier</groupId>
                 <artifactId>equalsverifier</artifactId>
-                <version>3.16.1</version>
+                <version>3.16.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.16.0</version>
+                <version>3.17.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git a/pom.xml b/pom.xml
@@ -459,6 +459,7 @@
             <exclude>**/*TestIT</exclude>
           </excludes>
           <skipAfterFailureCount>1</skipAfterFailureCount>
+          <useModulePath>false</useModulePath> <!-- testing with modules seems to be problematic right now -->
           <!-- We might need @{argLine} in the future if another plugin has issues -->
           <argLine>
             -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar

diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java
@@ -88,7 +88,7 @@ enum Type {
      * @param layerInfo The info to use to create the layer
      */
     public Layers(final JsonObject layerInfo) {
-        this (null, layerInfo);
+        this(null, layerInfo);
     }
 
     /**

diff --git a/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java b/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
@@ -37,7 +37,7 @@ public UrlLabel() {
      * @param url The URL to use, also used as description
      */
     public UrlLabel(String url) {
-        this (url, url, 0);
+        this(url, url, 0);
     }
 
     /**
@@ -46,7 +46,7 @@ public UrlLabel(String url) {
      * @param fontPlus The font increase in 1/72 of an inch units.
      */
     public UrlLabel(String url, int fontPlus) {
-        this (url, url, fontPlus);
+        this(url, url, fontPlus);
     }
 
     /**
@@ -55,7 +55,7 @@ public UrlLabel(String url, int fontPlus) {
      * @param description The description to display
      */
     public UrlLabel(String url, String description) {
-        this (url, description, 0);
+        this(url, description, 0);
     }
 
     /**

diff --git a/src/org/openstreetmap/josm/tools/Tag2Link.java b/src/org/openstreetmap/josm/tools/Tag2Link.java
@@ -35,7 +35,7 @@
 
 /**
  * Extracts web links from OSM tags.
- *
+ * <p>
  * The following rules are used:
  * <ul>
  * <li>internal rules for basic tags</li>
@@ -64,7 +64,7 @@ public final class Tag2Link {
             .collect(Collectors.joining("|"));
 
     static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
-            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.12/index.json"));
+            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.21/index.json"));
 
     static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",
             Arrays.asList("https://duckduckgo.com/?q=$1", "https://www.google.com/search?q=$1")).cached();

diff --git a/tools/ivy.xml b/tools/ivy.xml
@@ -16,19 +16,19 @@
         <!-- javacc->default -->
         <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.17.0" conf="checkstyle->default"/>
+        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="10.18.1" conf="checkstyle->default"/>
         <!-- proguard->default -->
         <dependency org="com.guardsquare" name="proguard-ant" rev="7.5.0" conf="proguard->default"/>
         <!-- pmd->default -->
-        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.4.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.4.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.4.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.5.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.5.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.5.0" conf="pmd->default"/>
         <dependency org="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
         <!-- spotbugs->default -->
         <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.6" conf="spotbugs->default"/>
         <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.6" conf="spotbugs->default"/>
         <!-- errorprone->default -->
-        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.30.0" conf="errorprone->default"/>
+        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.31.0" conf="errorprone->default"/>
         <!-- animal->default -->
         <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
     </dependencies>