diff --git a/ivy.xml b/ivy.xml index d362d515fa..facc10bc88 100644 --- a/ivy.xml +++ b/ivy.xml @@ -21,7 +21,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -57,18 +57,18 @@ - - - - - - - - - - + + + + + + + + + + - + diff --git a/ivysettings.xml b/ivysettings.xml index db8d426c6c..4c880ea421 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -7,5 +7,5 @@ - + diff --git a/nodist/pom.xml b/nodist/pom.xml index 7e8b64e75a..7ca5624bf6 100644 --- a/nodist/pom.xml +++ b/nodist/pom.xml @@ -17,10 +17,10 @@ https://josm.openstreetmap.de/sonar/ JOSM 1.49.a - 7.6.0 + 7.9.0 0.8.12 - 10.18.2 - 4.8.6 + 10.21.2 + 4.9.0 1.1.2 @@ -253,14 +253,14 @@ org.junit junit-bom - 5.11.3 + 5.11.4 pom import org.openstreetmap.jmapviewer jmapviewer - 2.22 + 2.23 provided @@ -351,13 +351,13 @@ org.wiremock wiremock - 3.9.2 + 3.10.0 test io.github.classgraph classgraph - 4.8.177 + 4.8.179 test @@ -369,7 +369,7 @@ nl.jqno.equalsverifier equalsverifier - 3.16.2 + 3.18.1 test @@ -393,7 +393,7 @@ [17 - 2.0.0 + 2.0.2 diff --git a/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java b/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java index 9156cbd539..f7c26bb109 100644 --- a/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java +++ b/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java @@ -151,7 +151,8 @@ public ImageryInfo getImageryInfo(int port) { String.format("tms[20]:http://localhost:%d/%h/{z}/{x}/{y}.png", port, this.hashCode()), "tms", (String) null, - (String) null + (String) null, + this.label ); } diff --git a/tools/ivy.xml b/tools/ivy.xml index c4ab608fda..9ab81012b4 100644 --- a/tools/ivy.xml +++ b/tools/ivy.xml @@ -16,19 +16,19 @@ - + - + - - - - + + + + - - + + - +