diff --git a/ivy.xml b/ivy.xml index c2796cdf1ec..06935a3d0d3 100644 --- a/ivy.xml +++ b/ivy.xml @@ -20,12 +20,12 @@ - + - + @@ -33,22 +33,22 @@ - + - + - + - + - + @@ -58,17 +58,17 @@ - - - - - - - - + + + + + + + + - - + + diff --git a/nodist/pom.xml b/nodist/pom.xml index 8e0c6926012..1a0ede13af1 100644 --- a/nodist/pom.xml +++ b/nodist/pom.xml @@ -11,15 +11,15 @@ US-ASCII 11 ${java.lang.version} - ${maven.compiler.release} - ${maven.compiler.release} + ${java.lang.version} + ${java.lang.version} true https://josm.openstreetmap.de/sonar/ JOSM 1.49.a - 7.4.0 + 7.5.0 0.8.12 - 10.17.0 + 10.18.1 4.8.6 @@ -241,14 +241,14 @@ org.junit junit-bom - 5.10.3 + 5.11.0 pom import org.openstreetmap.jmapviewer jmapviewer - 2.21 + 2.22 provided @@ -272,7 +272,7 @@ org.apache.commons commons-compress - 1.27.0 + 1.27.1 provided @@ -315,7 +315,7 @@ org.webjars.npm tag2link - 2024.8.12 + 2024.8.21 provided @@ -345,7 +345,7 @@ io.github.classgraph classgraph - 4.8.174 + 4.8.175 test @@ -357,13 +357,13 @@ nl.jqno.equalsverifier equalsverifier - 3.16.1 + 3.16.2 test org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 test diff --git a/pom.xml b/pom.xml index 78762a217bf..5621b42d7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -459,6 +459,7 @@ **/*TestIT 1 + false -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 index e182de3f2f8..1dcfe54f64f 100644 --- 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 index 1a5eb99da4a..38c17dd17e3 100644 --- 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 index d176e4702fe..a1e8917403e 100644 --- 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. - * + *

* The following rules are used: *

    *
  • internal rules for basic tags
  • @@ -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> 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 index 21753abf8b6..3342488b36c 100644 --- a/tools/ivy.xml +++ b/tools/ivy.xml @@ -16,19 +16,19 @@ - + - - - + + + - +