From bbb82c2237f62435d15db87ab5c68e251d52c5de Mon Sep 17 00:00:00 2001
From: "taylor.smock" <taylor.smock@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date: Wed, 13 Dec 2023 22:57:16 +0000
Subject: [PATCH] Dependency updates

ivy.xml
* org.openstreetmap.jmapviewer:jmapviewer: 2.16 -> 2.18
  * Add default methods to JMapViewer TileSource interface
  * Modularize for Java 9+
  * Add layer option for Bing Imagery
* jakarta.json:jakarta.json-api: 2.1.2 -> 2.1.3
* org.eclipse.parsson:parsson: 1.1.4 -> 1.1.5
* org.apache.commons:commons-jcs3-core: 3.1 -> 3.2
* org.apache.commons:commons-compress: 1.23.0 -> 1.25.0
* com.drewnoakes:metadata-extractor: 2.18.0 -> 2.19.0
* ch.poole:OpeningHoursParser: 0.27.0 -> 0.27.1
* org.webjars.npm:tag2link: 2022.11.28 -> 2023.11.21
  * This now parses OSM Wiki Data Items directly instead of via the (outdated)
    sophox API
* org.apache.commons:commons-lang3: 3.13.0 -> 3.14.0
* org.jacoco:org.jacoco.ant: 0.8.10 -> 0.8.11
  * Official Java 21 support
* com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
* io.github.classgraph:classgraph: 4.8.162 -> 4.8.165
* JUnit platform: 1.10.0 -> 1.10.1
* JUnit packages: 5.10.0 -> 5.10.1
* nl.jqno.equalsverifier:equalsverifier: 3.15.1 -> 3.15.4

tools/ivy.xml
* net.java.dev.javacc:javacc: 7.0.12 -> 7.0.13
* com.guardsquare:proguard-ant: 7.4.0-beta02 -> 7.4.1
* com.github.spotbugs:spotbugs-annotations: 4.7.3 -> 4.8.3
* com.google.errorprone:error_prone_core: 2.22.0 -> 2.23.0



git-svn-id: https://josm.openstreetmap.de/svn/trunk@18909 0c6e7542-c601-0410-84e7-c038aed88b3b
---
 ivy.xml         | 58 ++++++++++++++++++++++++-------------------------
 ivysettings.xml |  2 +-
 tools/ivy.xml   |  8 +++----
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 84376f0baa9..ca80bb00c4a 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -20,66 +20,66 @@
     </configurations>
     <dependencies>
         <!-- api->default -->
-        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
+        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.18"/>
         <!-- 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="jakarta.json" name="jakarta.json-api" rev="2.1.2"/>
+        <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.4"/>
-        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
-        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.23.0"/>
+        <dependency conf="runtimeOnly->default" org="org.eclipse.parsson" name="parsson" rev="1.1.5"/>
+        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
+        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.25.0"/>
         <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.18.0" transitive="false"/>
+        <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.27.0"/>
+        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.27.1"/>
         <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
         <!-- Don't forget to update org.openstreetmap.josm.tools.Tag2Link#PREF_SOURCE -->
-        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/>
+        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2023.11.21"/>
         <!-- sources->sources -->
-        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.16"/>
+        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.18"/>
         <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.2"/>
-        <dependency conf="sources->sources" org="org.eclipse.parsson" name="parsson" rev="1.1.4"/>
-        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
-        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.23.0"/>
+        <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.5"/>
+        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.2"/>
+        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.25.0"/>
         <dependency conf="sources->sources" 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="sources->sources" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
         <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.9"/>
         <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.18.0" transitive="false"/>
+        <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.27.0"/>
+        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.27.1"/>
         <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
-        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2022.11.28"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
+        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2023.11.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.13.0"/>
+        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.14.0"/>
         <!-- jacocoant->default -->
-        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.10">
+        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.11">
             <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
         </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.7.3"/>
+        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.3"/>
         <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
         <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.35.0"/>
-        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.162"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.0"/>
-        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.0"/>
-        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.0"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.0"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.0"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.0"/>
-        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.0"/>
+        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.165"/>
+        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.10.1"/>
+        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-suite" rev="1.10.1"/>
+        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.10.1"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-params" rev="5.10.1"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.1"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.10.1"/>
+        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.10.1"/>
         <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.15.1"/>
-        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.13.0"/>
+        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.15.4"/>
+        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.14.0"/>
         <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.0"/>
     </dependencies>
 </ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
index f02e7f83064..88248be58db 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -7,5 +7,5 @@
   </resolvers>
   <!-- Remove error_prone 2.10.0 specific statements in build.xml when we drop Java 8 as a build platform -->
   <property name="versions.error_prone" value="2.10.0" unlessset="isJava11"/>
-  <property name="versions.error_prone" value="2.22.0" ifset="isJava11"/>
+  <property name="versions.error_prone" value="2.23.0" ifset="isJava11"/>
 </ivysettings>
diff --git a/tools/ivy.xml b/tools/ivy.xml
index 22c911aef1b..b8da556bd2a 100644
--- a/tools/ivy.xml
+++ b/tools/ivy.xml
@@ -14,11 +14,11 @@
     </configurations>
     <dependencies>
         <!-- javacc->default -->
-        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.12" conf="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="9.3" conf="checkstyle->default"/>
         <!-- proguard->default -->
-        <dependency org="com.guardsquare" name="proguard-ant" rev="7.4.0-beta02" conf="proguard->default"/>
+        <dependency org="com.guardsquare" name="proguard-ant" rev="7.4.1" conf="proguard->default"/>
         <!-- pmd->default -->
         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.55.0" conf="pmd->default"/>
         <dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.55.0" conf="pmd->default"/>
@@ -27,8 +27,8 @@
             <artifact name="saxon" type="jar" maven:classifier="dom"/>
         </dependency>
         <!-- spotbugs->default -->
-        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.7.3" conf="spotbugs->default"/>
-        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.7.3" conf="spotbugs->default"/>
+        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.8.3" conf="spotbugs->default"/>
+        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.8.3" conf="spotbugs->default"/>
         <!-- errorprone->default -->
         <dependency org="com.google.errorprone" name="error_prone_core" rev="${versions.error_prone}" conf="errorprone->default"/>
         <!-- errorprone->default -->