Merge pull request #269 from Naenyn/feature/switch_to_jakarta_jaxb

Swapped javax to jakarta jaxb
uPortal-Project · Jan 31, 2025 · 06ee45c · 06ee45c
2 parents 545a38e + cd5892d
commit 06ee45c
Showing 1 changed file with 17 additions and 6 deletions.
diff --git 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>
@@ -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>