Index: trunk/src/org/openstreetmap/josm/data/StructUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/StructUtils.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/StructUtils.java	(revision 18723)
@@ -20,13 +20,13 @@
 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;
Index: trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java	(revision 18723)
@@ -4,7 +4,7 @@
 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: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 18723)
@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 
-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 javax.swing.ImageIcon;
 
Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java	(revision 18723)
@@ -10,8 +10,8 @@
 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;
Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Expression.java	(revision 18723)
@@ -6,8 +6,8 @@
 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;
 
 /**
Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Layers.java	(revision 18723)
@@ -15,9 +15,9 @@
 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;
Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyle.java	(revision 18723)
@@ -24,9 +24,9 @@
 
 import javax.imageio.ImageIO;
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
 
 import org.openstreetmap.josm.data.imagery.vectortile.mapbox.InvalidMapboxVectorTileException;
Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/Source.java	(revision 18723)
@@ -12,8 +12,8 @@
 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;
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Exception.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Exception.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Exception.java	(revision 18723)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.data.oauth;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 /**
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Parameters.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Parameters.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Parameters.java	(revision 18723)
@@ -8,10 +8,10 @@
 import java.util.Objects;
 
-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.openstreetmap.josm.spi.preferences.Config;
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Token.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Token.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuth20Token.java	(revision 18723)
@@ -11,10 +11,10 @@
 import java.time.Instant;
 
-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.openstreetmap.josm.tools.HttpClient;
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java	(revision 18723)
@@ -7,9 +7,9 @@
 import java.util.Objects;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.openstreetmap.josm.io.OsmApi;
Index: trunk/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/data/sources/SourcePreferenceEntry.java	(revision 18723)
@@ -4,5 +4,5 @@
 import java.util.Map;
 
-import javax.json.stream.JsonCollectors;
+import jakarta.json.stream.JsonCollectors;
 
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONMapRouletteWriter.java	(revision 18723)
@@ -6,10 +6,10 @@
 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;
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java	(revision 18723)
@@ -19,13 +19,13 @@
 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;
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 18723)
@@ -21,13 +21,13 @@
 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;
Index: trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java	(revision 18723)
@@ -9,14 +9,14 @@
 import java.util.Map.Entry;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-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.JsonException;
+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.osm.DataSet;
Index: trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java	(revision 18723)
@@ -11,5 +11,5 @@
 import java.util.Set;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 import javax.swing.text.html.HTMLEditorKit;
 
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 18723)
@@ -25,5 +25,5 @@
 import java.util.stream.Stream;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import org.openstreetmap.josm.data.Version;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java	(revision 18723)
@@ -8,9 +8,9 @@
 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;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenApiHandler.java	(revision 18723)
@@ -9,7 +9,7 @@
 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;
Index: trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 18723)
@@ -23,8 +23,8 @@
 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;
Index: trunk/src/org/openstreetmap/josm/tools/Territories.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Territories.java	(revision 18720)
+++ trunk/src/org/openstreetmap/josm/tools/Territories.java	(revision 18723)
@@ -22,11 +22,11 @@
 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;