From 9f056b2696ddaf2d92dae1aadad9b1aefc79a487 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Mon, 28 Feb 2022 08:41:44 +0000
Subject: [PATCH] SANTUARIO-548 - Switching to Jakarta XML Binding

---
 pom.xml                                       | 46 ++++++++-----------
 .../apache/xml/security/stax/config/Init.java |  8 ++--
 .../AbstractInputSecurityHeaderHandler.java   |  4 +-
 .../apache/xml/security/stax/ext/XMLSec.java  |  4 +-
 .../stax/ext/XMLSecurityConstants.java        |  6 +--
 .../security/stax/ext/XMLSecurityUtils.java   |  2 +-
 .../input/AbstractDecryptInputProcessor.java  |  6 +--
 .../input/AbstractSignatureInputHandler.java  |  2 +-
 .../input/XMLEncryptedKeyInputHandler.java    |  2 +-
 src/main/resources/bindings/c14n.xjb          |  6 +--
 src/main/resources/bindings/dsig.xjb          |  6 +--
 src/main/resources/bindings/dsig11.xjb        |  6 +--
 src/main/resources/bindings/rsa-pss.xjb       |  6 +--
 .../resources/bindings/security-config.xjb    |  6 +--
 src/main/resources/bindings/xenc.xjb          |  6 +--
 src/main/resources/bindings/xenc11.xjb        |  6 +--
 src/main/resources/bindings/xop.xjb           |  6 +--
 .../SecurityTokenFactoryImplTest.java         |  2 +-
 18 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/pom.xml b/pom.xml
index db8ac30f0..d6d0f7430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,16 +222,9 @@
             </plugin>
 
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.glassfish.jaxb</groupId>
-                        <artifactId>jaxb-runtime</artifactId>
-                        <version>2.3.5</version>
-                    </dependency>
-                </dependencies>
+                <groupId>com.evolvedbinary.maven.jvnet</groupId>
+                <artifactId>jaxb30-maven-plugin</artifactId>
+                <version>0.15.0</version>
                 <executions>
                     <execution>
                         <id>bindings</id>
@@ -266,7 +259,7 @@
                             <catalog>${basedir}/src/main/resources/bindings/bindings.cat</catalog>
                             <forceRegenerate>false</forceRegenerate>
                             <episode>true</episode>
-                            <specVersion>2.1</specVersion>
+                            <specVersion>3.0</specVersion>
                             <extension>true</extension>
                             <!-- disable schema validation since the validation code
                             doesn't respect the catalog and will do online lookups :-( -->
@@ -468,7 +461,8 @@
                                 </excludes>
                                 <systemPropertyVariables>
                                     <product.version>${project.version}</product.version>
-                                    <!--<javax.xml.bind.JAXBContext>${xmlsec.jaxb.context.class}</javax.xml.bind.JAXBContext>-->
+                                    <!--<jakarta.xml.bind.JAXBContext>${xmlsec.jaxb.context.class}</jakarta.xml.bind.JAXBContext>-->
+                                    <log4j.configuration>log4j-xmlsec.xml</log4j.configuration>
                                     <javax.xml.accessExternalDTD>file</javax.xml.accessExternalDTD>
                                 </systemPropertyVariables>
                             </configuration>
@@ -514,7 +508,7 @@
                                 <systemPropertyVariables>
                                     <product.version>${project.version}</product.version>
                                     <log4j.configuration>log4j-xmlsec.xml</log4j.configuration>
-                                    <!--<javax.xml.bind.JAXBContext>${xmlsec.jaxb.context.class}</javax.xml.bind.JAXBContext>-->
+                                    <!--<jakarta.xml.bind.JAXBContext>${xmlsec.jaxb.context.class}</jakarta.xml.bind.JAXBContext>-->
                                     <javax.xml.accessExternalDTD>file</javax.xml.accessExternalDTD>
                                 </systemPropertyVariables>
                             </configuration>
@@ -522,19 +516,6 @@
                     </plugins>
                 </pluginManagement>
              </build>
-             <dependencies>
-                 <dependency>
-                     <groupId>jakarta.xml.bind</groupId>
-                     <artifactId>jakarta.xml.bind-api</artifactId>
-                     <version>2.3.3</version>
-                 </dependency>
-                 <dependency>
-                     <groupId>org.glassfish.jaxb</groupId>
-                     <artifactId>jaxb-runtime</artifactId>
-                     <version>2.3.3</version>
-                     <scope>test</scope>
-                 </dependency>
-             </dependencies>
          </profile>
 
     </profiles>
@@ -550,6 +531,8 @@
         <commons.codec.version>1.15</commons.codec.version>
         <woodstox.core.version>6.2.6</woodstox.core.version>
         <jetty.version>9.4.45.v20220203</jetty.version>
+        <xml.bind.api.version>3.0.1</xml.bind.api.version>
+        <xml.bind.impl.version>3.0.2</xml.bind.impl.version>
         <xmlsec.jaxb.context.class />
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <targetJdk>1.8</targetJdk>
@@ -569,6 +552,11 @@
             <version>${slf4j.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${xml.bind.api.version}</version>
+        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -648,6 +636,12 @@
             <version>0.7.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${xml.bind.impl.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
diff --git a/src/main/java/org/apache/xml/security/stax/config/Init.java b/src/main/java/org/apache/xml/security/stax/config/Init.java
index 0da7116d1..1f523c7a0 100644
--- a/src/main/java/org/apache/xml/security/stax/config/Init.java
+++ b/src/main/java/org/apache/xml/security/stax/config/Init.java
@@ -26,10 +26,10 @@
 import org.apache.xml.security.configuration.ObjectFactory;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.UnmarshallerHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.UnmarshallerHandler;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.validation.Schema;
diff --git a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
index c6e0387d7..d0b7bab34 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
@@ -22,8 +22,8 @@
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
 import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Deque;
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
index 8980057d3..c23b14b01 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
@@ -25,8 +25,8 @@
 import java.util.HashSet;
 
 import javax.crypto.SecretKey;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.validation.Schema;
 
 import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
index 75485a1d5..bcacb7c34 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
@@ -21,9 +21,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.namespace.QName;
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
index 8a7ea050f..b258fbd27 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
@@ -38,7 +38,7 @@
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
index a4695cf23..a40feec53 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
@@ -44,9 +44,9 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.security.auth.DestroyFailedException;
 import javax.security.auth.Destroyable;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
index e5d2cb1af..71c75198c 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
@@ -50,7 +50,7 @@
 
 import javax.security.auth.DestroyFailedException;
 import javax.security.auth.Destroyable;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
index 944db66f7..664b5704d 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
@@ -33,7 +33,7 @@
 import javax.crypto.spec.OAEPParameterSpec;
 import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.apache.xml.security.binding.xmldsig.DigestMethodType;
 import org.apache.xml.security.binding.xmldsig.KeyInfoType;
diff --git a/src/main/resources/bindings/c14n.xjb b/src/main/resources/bindings/c14n.xjb
index 71f6fdcb9..0b03bf82c 100644
--- a/src/main/resources/bindings/c14n.xjb
+++ b/src/main/resources/bindings/c14n.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/exc-c14n.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/exc-c14n.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.excc14n"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/dsig.xjb b/src/main/resources/bindings/dsig.xjb
index d9ab9868a..780c460b4 100644
--- a/src/main/resources/bindings/dsig.xjb
+++ b/src/main/resources/bindings/dsig.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/xmldsig-core-schema.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/xmldsig-core-schema.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xmldsig"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/dsig11.xjb b/src/main/resources/bindings/dsig11.xjb
index d677180ad..39eb27efe 100644
--- a/src/main/resources/bindings/dsig11.xjb
+++ b/src/main/resources/bindings/dsig11.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/xmldsig11-schema.xsd" node="/xs:schema" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/xmldsig11-schema.xsd" node="/xs:schema">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xmldsig11"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/rsa-pss.xjb b/src/main/resources/bindings/rsa-pss.xjb
index 57a442ab8..e425904ce 100644
--- a/src/main/resources/bindings/rsa-pss.xjb
+++ b/src/main/resources/bindings/rsa-pss.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/rsa-pss.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/rsa-pss.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xmldsig.pss"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/security-config.xjb b/src/main/resources/bindings/security-config.xjb
index aeda9704c..ff8486c48 100644
--- a/src/main/resources/bindings/security-config.xjb
+++ b/src/main/resources/bindings/security-config.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="../schemas/security-config.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="../schemas/security-config.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.configuration"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/xenc.xjb b/src/main/resources/bindings/xenc.xjb
index 28783ad1e..e3c631931 100644
--- a/src/main/resources/bindings/xenc.xjb
+++ b/src/main/resources/bindings/xenc.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/xenc-schema.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/xenc-schema.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xmlenc"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/xenc11.xjb b/src/main/resources/bindings/xenc11.xjb
index f4fd5ebaa..607977ef0 100644
--- a/src/main/resources/bindings/xenc11.xjb
+++ b/src/main/resources/bindings/xenc11.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/xenc-schema-11.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/xenc-schema-11.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xmlenc11"/>
         </schemaBindings>
diff --git a/src/main/resources/bindings/xop.xjb b/src/main/resources/bindings/xop.xjb
index fca567d3d..7dc7e89bf 100644
--- a/src/main/resources/bindings/xop.xjb
+++ b/src/main/resources/bindings/xop.xjb
@@ -1,8 +1,8 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
-    <bindings schemaLocation="schemas/xop-include.xsd" version="1.0">
+          version="3.0">
+    <bindings schemaLocation="schemas/xop-include.xsd">
         <schemaBindings>
             <package name="org.apache.xml.security.binding.xop"/>
         </schemaBindings>
diff --git a/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java b/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
index 20575df6a..d672ee1d3 100644
--- a/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
+++ b/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
@@ -22,7 +22,7 @@
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.apache.xml.security.binding.xmldsig.KeyInfoType;
 import org.apache.xml.security.binding.xmldsig.ObjectFactory;