From 6ddfffc11f67135550945cea9ce3fa5d36fe8a5a Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@meta.com>
Date: Tue, 22 Aug 2023 09:54:29 -0600
Subject: [PATCH] Use jakarta.json instead of java.json

This also fixes various lint issues

Signed-off-by: Taylor Smock <tsmock@meta.com>
---
 .github/workflows/ant-release.yml             |  2 +-
 .github/workflows/ant.yml                     |  2 +-
 gradle.properties                             |  4 ++--
 .../java/com/kaart/openqa/GeoJsonReader.java  | 16 +++++++-------
 .../profiles/osmose/OsmoseInformation.java    | 22 +++++++++----------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ant-release.yml b/.github/workflows/ant-release.yml
index c30ac7a..aecaf28 100644
--- a/.github/workflows/ant-release.yml
+++ b/.github/workflows/ant-release.yml
@@ -8,7 +8,7 @@ jobs:
   call-workflow:
     uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1
     with:
-      josm-revision: "r18218"
+      josm-revision: "r18723"
       update-pluginssource: true
       plugin-jar-name: 'openqa'
     secrets:
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 09799cb..0afb1e2 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -18,7 +18,7 @@ jobs:
   call-workflow:
     strategy:
       matrix:
-        josm-revision: ["", "r18218"]
+        josm-revision: ["", "r18723"]
     uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1
     with:
       josm-revision: ${{ matrix.josm-revision }}
diff --git a/gradle.properties b/gradle.properties
index efd28eb..b7e2056 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 # The minimum JOSM version this plugin is compatible with (can be any numeric version)
-plugin.main.version = 18208
+plugin.main.version = 18723
 # The JOSM version this plugin is currently compiled against
 # Please make sure this version is available at https://josm.openstreetmap.de/download
 # The special values "latest" and "tested" are also possible here, but not recommended.
-plugin.compile.version = 18218
+plugin.compile.version = 18724
 plugin.canloadatruntime = true
 plugin.author = Taylor Smock <incoming+gokaart/JOSM_OpenQA@incoming.gitlab.com>
 plugin.class = com.kaart.openqa.OpenQA
diff --git a/src/main/java/com/kaart/openqa/GeoJsonReader.java b/src/main/java/com/kaart/openqa/GeoJsonReader.java
index e42a877..927aeb1 100644
--- a/src/main/java/com/kaart/openqa/GeoJsonReader.java
+++ b/src/main/java/com/kaart/openqa/GeoJsonReader.java
@@ -3,14 +3,14 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-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.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 
 import java.io.InputStream;
 import java.util.Map;
diff --git a/src/main/java/com/kaart/openqa/profiles/osmose/OsmoseInformation.java b/src/main/java/com/kaart/openqa/profiles/osmose/OsmoseInformation.java
index 6122e50..91ab492 100644
--- a/src/main/java/com/kaart/openqa/profiles/osmose/OsmoseInformation.java
+++ b/src/main/java/com/kaart/openqa/profiles/osmose/OsmoseInformation.java
@@ -4,17 +4,17 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.imageio.ImageIO;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-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.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParsingException;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;