Index: src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java --- a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java (date 1665067974500) @@ -5,10 +5,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; /** * A Mapbox vector style expression (immutable) Index: src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 --- a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java (date 1665067956697) @@ -14,12 +14,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; - +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.openstreetmap.josm.gui.mappaint.StyleKeys; import org.openstreetmap.josm.tools.Utils; Index: src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java --- a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java (date 1665067931451) @@ -23,11 +23,11 @@ import java.util.stream.Collectors; import javax.imageio.ImageIO; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException; import org.openstreetmap.josm.data.preferences.JosmBaseDirectories; import org.openstreetmap.josm.gui.MainApplication; Index: src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java --- a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java (date 1665067942680) @@ -11,11 +11,10 @@ import java.util.Objects; import java.util.function.IntFunction; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; - +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException; Index: src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java --- a/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java (date 1665067918348) @@ -1,5 +1,6 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.imagery.vectortile.mapbox; + import static org.openstreetmap.josm.tools.I18n.tr; import java.io.IOException; @@ -9,11 +10,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonException; -import javax.json.JsonObject; -import javax.json.JsonReader; - +import jakarta.json.Json; +import jakarta.json.JsonException; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.JosmTemplatedTMSTileSource; import org.openstreetmap.josm.data.imagery.vectortile.mapbox.style.MapboxVectorStyle; Index: src/org/openstreetmap/josm/data/imagery/DefaultLayer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java b/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java --- a/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java (date 1665067577170) @@ -3,10 +3,9 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; /** Index: src/org/openstreetmap/josm/data/imagery/ImageryInfo.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java --- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (date 1665067543503) @@ -19,11 +19,11 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; import javax.swing.ImageIcon; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.data.StructUtils.StructEntry; import org.openstreetmap.josm.data.sources.ISourceCategory; import org.openstreetmap.josm.data.sources.ISourceType; Index: src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java b/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java --- a/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java (date 1665067555269) @@ -3,8 +3,7 @@ import java.util.Map; -import javax.json.stream.JsonCollectors; - +import jakarta.json.stream.JsonCollectors; import org.openstreetmap.josm.data.StructUtils.StructEntry; import org.openstreetmap.josm.data.imagery.DefaultLayer; import org.openstreetmap.josm.data.imagery.Shape; Index: src/org/openstreetmap/josm/data/StructUtils.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/data/StructUtils.java b/src/org/openstreetmap/josm/data/StructUtils.java --- a/src/org/openstreetmap/josm/data/StructUtils.java (revision 18568) +++ b/src/org/openstreetmap/josm/data/StructUtils.java (date 1665067537852) @@ -19,16 +19,15 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonValue; -import javax.json.JsonWriter; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; import org.openstreetmap.josm.spi.preferences.IPreferences; import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; Index: src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java b/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java --- a/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (revision 18568) +++ b/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (date 1665067905881) @@ -9,9 +9,9 @@ import java.util.Arrays; import java.util.Locale; -import javax.json.JsonException; import javax.swing.JOptionPane; +import jakarta.json.JsonException; import org.openstreetmap.josm.actions.ExtensionFileFilter; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.gui.MainApplication; Index: src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java --- a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java (date 1665067778430) @@ -7,12 +7,11 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; import org.openstreetmap.josm.io.remotecontrol.RequestProcessor; Index: src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java --- a/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java (date 1665067809813) @@ -8,10 +8,9 @@ import java.util.Arrays; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; - +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; import org.openstreetmap.josm.data.preferences.JosmUrls; import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; import org.openstreetmap.josm.io.remotecontrol.RemoteControl; Index: src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java --- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (date 1665067809807) @@ -24,8 +24,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.json.Json; - +import jakarta.json.Json; import org.openstreetmap.josm.data.Version; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; Index: src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java b/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java --- a/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java (date 1665067884162) @@ -5,13 +5,12 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.WaySegment; Index: src/org/openstreetmap/josm/io/GeoJSONReader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/GeoJSONReader.java b/src/org/openstreetmap/josm/io/GeoJSONReader.java --- a/src/org/openstreetmap/josm/io/GeoJSONReader.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/GeoJSONReader.java (date 1665067665124) @@ -18,16 +18,15 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParser.Event; -import javax.json.stream.JsonParsingException; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; +import jakarta.json.stream.JsonParsingException; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.BBox; Index: src/org/openstreetmap/josm/io/GeoJSONWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java --- a/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/GeoJSONWriter.java (date 1665067679794) @@ -20,16 +20,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParsingException; - +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParsingException; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.coor.ILatLon; Index: src/org/openstreetmap/josm/io/OsmJsonReader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/io/OsmJsonReader.java b/src/org/openstreetmap/josm/io/OsmJsonReader.java --- a/src/org/openstreetmap/josm/io/OsmJsonReader.java (revision 18568) +++ b/src/org/openstreetmap/josm/io/OsmJsonReader.java (date 1665067649120) @@ -7,15 +7,14 @@ import java.util.Collection; import java.util.Map.Entry; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParser.Event; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.PrimitiveData; import org.openstreetmap.josm.data.osm.RelationData; Index: src/org/openstreetmap/josm/tools/Tag2Link.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/tools/Tag2Link.java b/src/org/openstreetmap/josm/tools/Tag2Link.java --- a/src/org/openstreetmap/josm/tools/Tag2Link.java (revision 18568) +++ b/src/org/openstreetmap/josm/tools/Tag2Link.java (date 1665067610005) @@ -22,11 +22,10 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.data.preferences.CachingProperty; Index: src/org/openstreetmap/josm/tools/Territories.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/org/openstreetmap/josm/tools/Territories.java b/src/org/openstreetmap/josm/tools/Territories.java --- a/src/org/openstreetmap/josm/tools/Territories.java (revision 18568) +++ b/src/org/openstreetmap/josm/tools/Territories.java (date 1665067593133) @@ -21,14 +21,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonString; -import javax.json.JsonValue; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParser.Event; -import javax.json.stream.JsonParsingException; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; +import jakarta.json.stream.JsonParsingException; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; Index: test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java b/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java --- a/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (revision 18568) +++ b/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (date 1665068122455) @@ -9,11 +9,11 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.data.coor.LatLon; @@ -25,8 +25,6 @@ import org.openstreetmap.josm.tools.HttpClient; import org.xml.sax.SAXException; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Various integration tests with Taginfo. */ Index: test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java --- a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java (date 1665068193998) @@ -3,10 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - -import javax.json.Json; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonValue; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; Index: test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java --- a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java (date 1665068177195) @@ -9,10 +9,9 @@ import java.text.MessageFormat; import java.util.Locale; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; Index: test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java --- a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java (date 1665068149073) @@ -28,13 +28,14 @@ import java.util.stream.Collectors; import javax.imageio.ImageIO; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; +import nl.jqno.equalsverifier.EqualsVerifier; import org.awaitility.Awaitility; import org.awaitility.Durations; import org.junit.jupiter.api.Test; @@ -52,8 +53,6 @@ import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.ImageProvider; -import nl.jqno.equalsverifier.EqualsVerifier; - /** * Test class for {@link MapboxVectorStyle} * @author Taylor Smock Index: test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java --- a/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java (date 1665068208570) @@ -7,19 +7,16 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; - import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; - -import org.openstreetmap.josm.data.Bounds; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException; /** Index: test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java b/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java --- a/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java (date 1665068220213) @@ -24,11 +24,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; import javax.swing.SwingUtilities; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import mockit.Mock; +import mockit.MockUp; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,9 +51,6 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; -import mockit.Mock; -import mockit.MockUp; - /** * Test class for {@link ValidatorCLI} * @author Taylor Smock Index: test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java b/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java --- a/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java (revision 18568) +++ b/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java (date 1665068137006) @@ -7,14 +7,12 @@ import java.net.HttpURLConnection; import java.net.URL; -import javax.json.Json; - +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import jakarta.json.Json; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.testutils.JOSMTestRules; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Integration tests of {@link PlatformHook} class. */ Index: ivy.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/ivy.xml b/ivy.xml --- a/ivy.xml (revision 18568) +++ b/ivy.xml (date 1665068591894) @@ -21,8 +21,11 @@ + + +