Merge pull request #5 from smahieu87/feature/jakarta

jakarta upgrade
OxalisCommunity · Oct 22, 2024 · cab36c1 · cab36c1
2 parents cf742fc + 2e7bd4d
commit cab36c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -126,8 +126,8 @@
         <testng.version>7.7.1</testng.version>
         <mockito-core.version>4.11.0</mockito-core.version>
         <joda-time.version>2.12.0</joda-time.version>
-        <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
-        <jaxb-impl-version>2.3.3</jaxb-impl-version>
+        <jakarta.xml.bind-api-version>4.0.2</jakarta.xml.bind-api-version>
+        <jaxb-impl-version>4.0.0</jaxb-impl-version>
         <guava.version>31.1-jre</guava.version>
         <pkix-ocsp.version>2.2.0</pkix-ocsp.version>
         <metainf-services.version>1.9</metainf-services.version>
@@ -232,9 +232,9 @@
             </plugin>
 
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -254,18 +254,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

diff --git a/src/main/java/network/oxalis/commons/certvalidator/ValidatorLoaderParser.java b/src/main/java/network/oxalis/commons/certvalidator/ValidatorLoaderParser.java
@@ -11,8 +11,8 @@
 import network.oxalis.commons.certvalidator.lang.ValidatorParsingException;
 import network.oxalis.commons.certvalidator.structure.Junction;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.transform.stream.StreamSource;
 import java.io.InputStream;
 import java.util.*;