See #23220: Use jakarta.annotation instead of javax.annotation (JSR305)

Signed-off-by: Taylor Smock <[email protected]>
JOSM · Oct 25, 2023 · d9746e9 · d9746e9
1 parent 53cafaf
commit d9746e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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 = 18723
+plugin.main.version = 18877
 # 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 = 18724
+plugin.compile.version = 18877
 plugin.canloadatruntime = true
 plugin.author = floscher <incoming+josm-plugin-wikipedia-6702380-issue-@incoming.gitlab.com>, simon04
 plugin.class = org.wikipedia.WikipediaPlugin

diff --git a/src/main/java/org/wikipedia/data/WikidataEntry.java b/src/main/java/org/wikipedia/data/WikidataEntry.java
@@ -4,14 +4,16 @@
 import java.awt.Color;
 import java.util.Comparator;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.tools.RegexUtil;
 
+import jakarta.annotation.Nonnull;
+
 public class WikidataEntry extends WikipediaEntry {
 
     public final String label;

diff --git a/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java b/src/main/java/org/wikipedia/gui/WikidataTagCellRenderer.java
@@ -15,17 +15,20 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
-import javax.annotation.Nonnull;
+
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
+
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.data.WikidataEntry;
 import org.wikipedia.tools.RegexUtil;
 
+import jakarta.annotation.Nonnull;
+
 public class WikidataTagCellRenderer extends DefaultTableCellRenderer {
 
     final Map<String, CompletableFuture<String>> labelCache = new ConcurrentHashMap<>();