Changeset 19191 in josm

Timestamp:

2024-08-12T21:32:09+02:00 (2 months ago)

Author:

taylor.smock

Message:

Dependency updates

ivy.xml

• org.openstreetmap.jmapviewer:jmapviewer: 2.20 -> 2.21 (see #23841)
• org.eclipse.parsson:parsson: 1.1.6 -> 1.1.7
• org.apache.commons:commons-compress: 1.26.2 -> 1.27.0
• org.tukaani:xz: 1.9 -> 1.10 (PD -> 0BSD)
• org.webjars.npm:tag2link: 2024.7.8 -> 2024.8.12

tools/ivy.xml

• net.sourceforge.pmd:pmd: 7.3.0 -> 7.4.0
• com.google.errorprone:error_prone: 2.29.2 -> 2.30.0

Location:

trunk

Files:

• CONTRIBUTION (modified) (2 diffs)
• README (modified) (2 diffs)
• ivy.xml (modified) (4 diffs)
• nodist/pom.xml (modified) (9 diffs)
• src/org/openstreetmap/josm/tools/Tag2Link.java (modified) (1 diff)
• tools/ivy.xml (modified) (2 diffs)

trunk/CONTRIBUTION

@@ -44 +44 @@
 with Apache license version 2.0.
 
-The signpost code (http://code.google.com/p/oauth-signpost/)
-is from Matthias Käppler and licensed with the Apache License 2.0.
-
 The mail/url validator routines use code from Apache Commons
 Validator which is licensed with Apache license version 2.0.
@@ -75 +72 @@
 The XZ code (https://tukaani.org/xz/java.html)
 is from Lasse Collin and Igor Pavlov
-and license free Public Domain.
+and license BSD Zero Clause License (0BSD).
 
 The Windows shortcut parsing code is from StackOverflow:

trunk/README

@@ -174 +174 @@
 * Metadata Extractor: Read EXIF Metadata of photos
     -> https://github.com/drewnoakes/metadata-extractor
-* Signpost: OAuth library
-    -> https://github.com/mttkay/signpost
 * MultiSplitPane: Small lib for GUI layout management
     src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
@@ -183 +181 @@
     src/org/openstreetmap/josm/gui/util/CheckThreadViolationRepaintManager.java
     -> https://github.com/floscher/swinghelper
-* xz extractor
+* xz extractor (0BSD)
     -> https://tukaani.org/xz/java.html
 * OpeningHoursParser (MIT license)

trunk/ivy.xml

@@ -21 +21 @@
     <dependencies>
         <!-- api->default -->
-        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
+        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
         <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="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.26.2"/>
+        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
         <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.9"/>
+        <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"/>
@@ -34 +34 @@
         <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.7.8"/>
+        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2024.8.12"/>
         <!-- sources->sources -->
-        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.20"/>
+        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.21"/>
         <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.6"/>
+        <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.26.2"/>
+        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.27.0"/>
         <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.9"/>
+        <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.7.8"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
+        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2024.8.12"/><!-- 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.14.0"/>
+        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
         <!-- jacocoant->default -->
         <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.12">
@@ -58 +58 @@
         <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.8.0"/>
+        <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"/>
@@ -69 +69 @@
         <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"/>
-        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.1"/>
+        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.16.0"/>
+        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.2"/>
     </dependencies>
 </ivy-module>

trunk/nodist/pom.xml

@@ -18 +18 @@
         <sonar.projectKey>JOSM</sonar.projectKey>
         <jmockit.version>1.49.a</jmockit.version>
-        <pmd.version>7.3.0</pmd.version>
+        <pmd.version>7.4.0</pmd.version>
     </properties>
     <modules>
@@ -244 +244 @@
                 <groupId>org.openstreetmap.jmapviewer</groupId>
                 <artifactId>jmapviewer</artifactId>
-                <version>2.20</version>
+                <version>2.21</version>
                 <scope>provided</scope>
             </dependency>
@@ -256 +256 @@
                 <groupId>org.eclipse.parsson</groupId>
                 <artifactId>parsson</artifactId>
-                <version>1.1.6</version>
+                <version>1.1.7</version>
                 <scope>provided</scope>
             </dependency>
@@ -268 +268 @@
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.26.2</version>
+                <version>1.27.0</version>
                 <scope>provided</scope>
             </dependency>
@@ -280 +280 @@
                 <groupId>org.tukaani</groupId>
                 <artifactId>xz</artifactId>
-                <version>1.9</version>
+                <version>1.10</version>
                 <scope>provided</scope>
             </dependency>
@@ -311 +311 @@
                 <groupId>org.webjars.npm</groupId>
                 <artifactId>tag2link</artifactId>
-                <version>2024.7.8</version>
+                <version>2024.8.12</version>
                 <scope>provided</scope>
             </dependency>
@@ -335 +335 @@
                 <groupId>org.wiremock</groupId>
                 <artifactId>wiremock</artifactId>
-                <version>3.8.0</version>
+                <version>3.9.1</version>
                 <scope>test</scope>
             </dependency>
@@ -359 +359 @@
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.14.0</version>
+                <version>3.16.0</version>
                 <scope>compile</scope>
             </dependency>
@@ -365 +365 @@
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
-                <version>4.2.1</version>
+                <version>4.2.2</version>
                 <scope>test</scope>
             </dependency>

trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

@@ -65 +65 @@
 
     static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
-            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.7.8/index.json"));
+            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2024.8.12/index.json"));
 
     static final CachingProperty<List<String>> PREF_SEARCH_ENGINES = new ListProperty("tag2link.search",

trunk/tools/ivy.xml

@@ -21 +21 @@
         <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.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="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="org.xmlresolver" name="xmlresolver" rev="6.0.4" conf="pmd->default"/>
         <!-- spotbugs->default -->
@@ -29 +29 @@
         <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.29.2" conf="errorprone->default"/>
+        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.30.0" conf="errorprone->default"/>
         <!-- animal->default -->
         <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.24" conf="animal->default"/>