From 07cac429064457a2e1eac9bf39f5abfb88718361 Mon Sep 17 00:00:00 2001
From: Henning Bang Halvorsen <henning.bang.halvorsen@sparebank1.no>
Date: Thu, 14 Aug 2025 14:53:53 +0200
Subject: [PATCH] Import xml bind api from Jakarta instead of Javax

---
 pom.xml                                                      | 5 +++++
 troxy-core/pom.xml                                           | 4 ++++
 .../src/main/java/no/sb1/troxy/http/common/Request.java      | 3 ++-
 .../src/main/java/no/sb1/troxy/http/common/Response.java     | 3 ++-
 .../src/main/java/no/sb1/troxy/record/v2/Recording.java      | 3 ++-
 .../src/main/java/no/sb1/troxy/record/v3/Recording.java      | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 603a213..7d4c331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,11 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${servlet.version}</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>3.0.1</version>
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
diff --git a/troxy-core/pom.xml b/troxy-core/pom.xml
index 639ce48..56b5666 100644
--- a/troxy-core/pom.xml
+++ b/troxy-core/pom.xml
@@ -15,6 +15,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/troxy-core/src/main/java/no/sb1/troxy/http/common/Request.java b/troxy-core/src/main/java/no/sb1/troxy/http/common/Request.java
index 8088fc0..af8b812 100644
--- a/troxy-core/src/main/java/no/sb1/troxy/http/common/Request.java
+++ b/troxy-core/src/main/java/no/sb1/troxy/http/common/Request.java
@@ -8,7 +8,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.bind.annotation.XmlTransient;
+
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/troxy-core/src/main/java/no/sb1/troxy/http/common/Response.java b/troxy-core/src/main/java/no/sb1/troxy/http/common/Response.java
index d7fffb8..9901c1b 100644
--- a/troxy-core/src/main/java/no/sb1/troxy/http/common/Response.java
+++ b/troxy-core/src/main/java/no/sb1/troxy/http/common/Response.java
@@ -6,7 +6,8 @@
 import java.net.HttpURLConnection;
 import java.util.List;
 import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/troxy-core/src/main/java/no/sb1/troxy/record/v2/Recording.java b/troxy-core/src/main/java/no/sb1/troxy/record/v2/Recording.java
index d7424f2..ac6548a 100644
--- a/troxy-core/src/main/java/no/sb1/troxy/record/v2/Recording.java
+++ b/troxy-core/src/main/java/no/sb1/troxy/record/v2/Recording.java
@@ -9,7 +9,8 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.xml.bind.annotation.XmlTransient;
+
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/troxy-core/src/main/java/no/sb1/troxy/record/v3/Recording.java b/troxy-core/src/main/java/no/sb1/troxy/record/v3/Recording.java
index e553eb6..309f29d 100644
--- a/troxy-core/src/main/java/no/sb1/troxy/record/v3/Recording.java
+++ b/troxy-core/src/main/java/no/sb1/troxy/record/v3/Recording.java
@@ -1,5 +1,6 @@
 package no.sb1.troxy.record.v3;
 
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -7,7 +8,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlTransient;
 
 /**
  * This is a container class for a recording.