Merge branch 'praszuk/fix/javax-to-jakarta'

praszuk · Aug 2, 2024 · 3b6a29c · 3b6a29c
2 parents d664246 + b354e68
commit 3b6a29c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-plugin.main.version=17856
-plugin.compile.version=18543
+plugin.main.version=18877
+plugin.compile.version=19160
 plugin.author=NieWnen
 plugin.class=org.openstreetmap.josm.plugins.plbuildings.BuildingsPlugin
 plugin.icon=images/plbuildings.png

diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/actions/BuildingsImportAction.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/actions/BuildingsImportAction.java
@@ -21,7 +21,7 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;

diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/gui/BuildingsToggleDialog.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/gui/BuildingsToggleDialog.java
@@ -8,7 +8,7 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;

diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/models/BuildingsImportStats.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/models/BuildingsImportStats.java
@@ -3,9 +3,9 @@
 import org.openstreetmap.josm.plugins.plbuildings.BuildingsSettings;
 import org.openstreetmap.josm.tools.Logging;
 
-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 java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/utils/PreCheckUtils.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/utils/PreCheckUtils.java
@@ -3,7 +3,7 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.Logging;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import static org.openstreetmap.josm.plugins.plbuildings.data.BuildingsTags.HOUSE_DETAILS;