From 34d3f27a5c17fe8f4352872fd57f44b2294510b5 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 29 Jan 2025 15:43:40 -0500
Subject: [PATCH 1/2] Swapped javax to jakarta jaxb

---
 pom.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d35affc0..25c6dcd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <icu4j.version>72.1</icu4j.version>
         <hsqldb.version>2.6.1</hsqldb.version>
         <jaxb2basics.version>0.6.0</jaxb2basics.version>
+        <jaxb.version>2.3.3</jaxb.version>
         <jackson.version>2.14.1</jackson.version>
         <logbackVersion>1.3.12</logbackVersion>
         <pluto.version>2.1.0-M3</pluto.version>
@@ -292,6 +293,14 @@
                         <groupId>org.slf4j</groupId>
                         <artifactId>jcl-over-slf4j</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -661,14 +670,16 @@
             <version>1.3.2</version>
         </dependency>
         <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>${jaxb.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 

From cd5892dfcedbf86c2dc6a0c2fae6a3b300642f35 Mon Sep 17 00:00:00 2001
From: Benito Gonzalez <bgonzalez@unicon.net>
Date: Fri, 31 Jan 2025 15:02:32 -0800
Subject: [PATCH 2/2] Add jaxb.version back into pom.xml

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 791c9d83..85eab171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <icu4j.version>72.1</icu4j.version>
         <hsqldb.version>2.6.1</hsqldb.version>
         <jaxb2basics.version>0.6.0</jaxb2basics.version>
+        <jaxb.version>2.3.3</jaxb.version>
         <jackson.version>2.18.2</jackson.version>
         <logbackVersion>1.3.12</logbackVersion>
         <pluto.version>2.1.0-M3</pluto.version>