From c6dc3319f66c2d55c808e8c376976af17067ab04 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Tue, 30 Dec 2025 00:07:27 +0100
Subject: [PATCH] Migrate javax.xml.bind to jakarta.xml.bind

* Upgrade javax.xml.bind.jaxb-api 2.3.1 to jakarta.xml.bind-api 4.0.4
* Upgrade (unrelated) jdt-annotations from 2.3.100 to 2.4.100

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 pom.xml                                                | 10 +++++-----
 .../openhab/tools/analysis/tools/SpotBugsChecker.java  |  8 ++++----
 .../analysis/tools/internal/SpotBugsVisitors.java      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index a81a0fd1..514c8b57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
     <mojo.executor.version>2.4.1</mojo.executor.version>
     <org.jsoup.version>1.19.1</org.jsoup.version>
     <sat.version>0.18.0</sat.version>
-    <jdt-annotations.version>2.3.100</jdt-annotations.version>
+    <jdt-annotations.version>2.4.100</jdt-annotations.version>
     <flexmark.version>0.64.8</flexmark.version>
     <maven.surefire.plugin.version>3.5.4</maven.surefire.plugin.version>
     <jetty.server.version>9.4.50.v20221201</jetty.server.version>
@@ -93,14 +93,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.1</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.1</version>
+      <version>4.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
diff --git a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java
index 166f7997..044ea1a7 100644
--- a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java
+++ b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java
@@ -25,10 +25,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
@@ -39,6 +35,10 @@
 import org.openhab.tools.analysis.tools.internal.SpotBugsVisitors;
 import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+
 /**
  * <p>
  * Executes the
diff --git a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/internal/SpotBugsVisitors.java b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/internal/SpotBugsVisitors.java
index d9cd3b01..abd0ddc4 100644
--- a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/internal/SpotBugsVisitors.java
+++ b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/internal/SpotBugsVisitors.java
@@ -15,11 +15,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.apache.commons.lang3.StringUtils;
 
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 /**
  * A JAXB model of the SpotBugs visitors XML file
  *