Index: trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java	(revision 18718)
+++ trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java	(revision 18723)
@@ -10,8 +10,8 @@
 import java.util.List;
 
-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.junit.jupiter.api.Test;
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/ExpressionTest.java	(revision 18723)
@@ -5,6 +5,6 @@
 
 
-import javax.json.Json;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/LayersTest.java	(revision 18723)
@@ -10,7 +10,7 @@
 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;
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java	(revision 18723)
@@ -29,10 +29,10 @@
 
 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 org.awaitility.Awaitility;
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/SourceTest.java	(revision 18723)
@@ -13,7 +13,7 @@
 import java.util.stream.Stream;
 
-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 org.openstreetmap.josm.data.Bounds;
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java	(revision 18723)
@@ -25,7 +25,7 @@
 import java.util.stream.Stream;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import mockit.Mock;
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmJsonReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmJsonReaderTest.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmJsonReaderTest.java	(revision 18723)
@@ -17,5 +17,5 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 
 import org.junit.jupiter.api.Test;
@@ -260,7 +260,7 @@
      * The JSON parser throws {@link RuntimeException}s, specifically
      * <ul>
-     *     <li>{@link javax.json.JsonException}</li>
-     *     <li>{@link javax.json.stream.JsonParsingException}, extends {@link javax.json.JsonException}</li>
-     *     <li>{@link javax.json.stream.JsonGenerationException}, extends {@link javax.json.JsonException}
+     *     <li>{@link jakarta.json.JsonException}</li>
+     *     <li>{@link jakarta.json.stream.JsonParsingException}, extends {@link jakarta.json.JsonException}</li>
+     *     <li>{@link jakarta.json.stream.JsonGenerationException}, extends {@link jakarta.json.JsonException}
      *         (which we don't care about when we are <em>parsing</em> JSON)</li>
      * </ul>
@@ -300,5 +300,5 @@
         // Check that a generic parsing error is properly reported
         ide = assertThrows(IllegalDataException.class, () -> OsmJsonReader.parseDataSet(bais, NullProgressMonitor.INSTANCE));
-        assertEquals("javax.json.stream.JsonParsingException: Invalid token=COMMA at (line no=1, column no=8, offset=7). " +
+        assertEquals("jakarta.json.stream.JsonParsingException: Invalid token=COMMA at (line no=1, column no=8, offset=7). " +
                 "Expected tokens are: [COLON]", ExceptionUtil.explainException(ide));
         bais.reset();
Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java	(revision 18718)
+++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java	(revision 18723)
@@ -8,5 +8,5 @@
 import java.net.URL;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import org.junit.jupiter.api.Test;