From 2463cf56720b5600138b4e117758d412422a846d Mon Sep 17 00:00:00 2001
From: "taylor.smock" <taylor.smock@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date: Wed, 17 Jul 2024 18:50:17 +0000
Subject: [PATCH] Dependency updates

ivy.xml
* Remove old dependencies (javax.json, jsr305 -- fixes #23220)
* JMapViewer: 2.19 -> 2.20 - fixes deadlock when Bing attribution cannot be loaded (see #23721)
* Wiremock: 3.6.0 -> 3.8.0
* Various other minor dependency updates

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19148 0c6e7542-c601-0410-84e7-c038aed88b3b
---
 ivy.xml        | 29 ++++++++++++-----------------
 nodist/pom.xml | 14 +++++++-------
 pom.xml        | 22 +---------------------
 tools/ivy.xml  | 14 +++++++-------
 4 files changed, 27 insertions(+), 52 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index f4b459f99ec..13f304859cc 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -20,18 +20,13 @@
     </configurations>
     <dependencies>
         <!-- api->default -->
-        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.19"/>
-        <!-- The javax json dependencies should be removed sometime in 2024 -->
-        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
-        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
+        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
         <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.6"/>
         <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.26.2"/>
         <dependency conf="api->default" org="jakarta.annotation" name="jakarta.annotation-api" rev="2.1.1" />
-        <!-- jsr305 has some source files with non-free CC-BY-2.5 license. Remove after 2024-06-01 to give plugins time to migrate. See #23220 for details -->
-        <dependency conf="api->default" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
         <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.9"/>
         <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"/>
@@ -40,7 +35,7 @@
         <!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.7.8"/>
         <!-- sources->sources -->
-        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.19"/>
+        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
         <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
         <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
         <dependency conf="sources->sources" org="jakarta.json" name="jakarta.json-api" rev="2.1.3"/>
@@ -64,17 +59,17 @@
         </dependency>
         <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
         <!-- test->default -->
-        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.5"/>
+        <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.6.0"/>
-        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.173"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.2"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.2"/>
-        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.2"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.2"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.2"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.2"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.2"/>
+        <dependency conf="test->default" org="org.wiremock" name="wiremock" rev="3.8.0"/>
+        <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="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.14.0"/>
diff --git a/nodist/pom.xml b/nodist/pom.xml
index b59294d7c76..11f2266d21d 100644
--- a/nodist/pom.xml
+++ b/nodist/pom.xml
@@ -17,7 +17,7 @@
         <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.2.0</pmd.version>
+        <pmd.version>7.3.0</pmd.version>
     </properties>
     <modules>
         <module>..</module>
@@ -236,14 +236,14 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.2</version>
+                <version>5.10.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.openstreetmap.jmapviewer</groupId>
                 <artifactId>jmapviewer</artifactId>
-                <version>2.19</version>
+                <version>2.20</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -322,7 +322,7 @@
             <dependency>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-annotations</artifactId>
-                <version>4.8.5</version>
+                <version>4.8.6</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -334,13 +334,13 @@
             <dependency>
                 <groupId>org.wiremock</groupId>
                 <artifactId>wiremock</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.github.classgraph</groupId>
                 <artifactId>classgraph</artifactId>
-                <version>4.8.173</version>
+                <version>4.8.174</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -359,7 +359,7 @@
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
                 <version>3.14.0</version>
-                <scope>test</scope>
+                <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.awaitility</groupId>
diff --git a/pom.xml b/pom.xml
index db2cb4c39a2..3b91986a4cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,26 +75,6 @@
       <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>
     </dependency>
-    <!-- Deprecated dependencies (to remove sometime in 2024)-->
-    <dependency>
-      <groupId>javax.json</groupId>
-      <artifactId>javax.json-api</artifactId>
-      <version>1.1.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.json</artifactId>
-      <version>1.1.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <!-- end Deprecated dependencies -->
     <dependency>
       <groupId>org.openstreetmap.jmapviewer</groupId>
       <artifactId>jmapviewer</artifactId>
@@ -622,7 +602,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <!-- TODO: Do we want to minimize the jar? <minimizeJar>true</minimizeJar> -->
+              <minimizeJar>true</minimizeJar>
               <filters>
                 <filter>
                   <artifact>org.webjars.npm:tag2link</artifact>
diff --git a/tools/ivy.xml b/tools/ivy.xml
index 2b18a33ea90..80ea5a2479b 100644
--- a/tools/ivy.xml
+++ b/tools/ivy.xml
@@ -20,16 +20,16 @@
         <!-- 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.2.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.2.0" conf="pmd->default"/>
-        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.2.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="7.3.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-ant" rev="7.3.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="7.3.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.5" conf="spotbugs->default"/>
-        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.5" conf="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.28.0" conf="errorprone->default"/>
+        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.29.0" conf="errorprone->default"/>
         <!-- animal->default -->
-        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.23" conf="animal->default"/>
+        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>
     </dependencies>
 </ivy-module>