From 734a16233ae7eb0989a126be03d2dc39031cfadf Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Mon, 9 Sep 2024 11:46:03 -0400
Subject: [PATCH] DBZ-8219 Fix JAXB xml parsing of Ehcache configuration

---
 debezium-connector-oracle/pom.xml             | 18 ++++++++---------
 .../EhcacheLogMinerEventProcessor.java        |  4 ++++
 .../ehcache/configuration-template.xml        | 20 +++++++++----------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/debezium-connector-oracle/pom.xml b/debezium-connector-oracle/pom.xml
index e0e8b6ea3..65714cd39 100644
--- a/debezium-connector-oracle/pom.xml
+++ b/debezium-connector-oracle/pom.xml
@@ -92,15 +92,11 @@
             <artifactId>ehcache</artifactId>
             <version>${version.ehcache}</version>
         </dependency>
+        <!-- Ehcache JAXB implementation dependency -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.1</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${version.jaxb.implementation}</version>
         </dependency>
 
         <!-- Testing -->
@@ -198,9 +194,13 @@
         <adapter.name>logminer</adapter.name>
         <log.mining.buffer.type.name>memory</log.mining.buffer.type.name>
         <log.mining.read.only.mode>false</log.mining.read.only.mode>
-        <version.ehcache>3.9.6</version.ehcache>
         <version.oracle.server>19.3.0</version.oracle.server>
 
+        <!-- EhCache Specific Versions -->
+        <version.ehcache>3.9.6</version.ehcache>
+        <!-- Must be aligned with the version.jaxb of the JAXB-API -->
+        <version.jaxb.implementation>2.3.1</version.jaxb.implementation>
+
         <protobuf.output.directory>${project.basedir}/generated-sources</protobuf.output.directory>
 
         <!--
diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/processor/ehcache/EhcacheLogMinerEventProcessor.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/processor/ehcache/EhcacheLogMinerEventProcessor.java
index 9b35f436a..8620058e1 100644
--- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/processor/ehcache/EhcacheLogMinerEventProcessor.java
+++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/processor/ehcache/EhcacheLogMinerEventProcessor.java
@@ -117,6 +117,10 @@ private CacheManager createCacheManager(OracleConnectorConfig connectorConfig) {
 
             // Create the full XML configuration based on configuration template
             final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+            // Required for propagating namespace info
+            factory.setNamespaceAware(true);
+
             final DocumentBuilder builder = factory.newDocumentBuilder();
 
             final String xmlData = getConfigurationWithSubstitutions(ehcacheConfig);
diff --git a/debezium-connector-oracle/src/main/resources/ehcache/configuration-template.xml b/debezium-connector-oracle/src/main/resources/ehcache/configuration-template.xml
index fefae3752..921013c44 100644
--- a/debezium-connector-oracle/src/main/resources/ehcache/configuration-template.xml
+++ b/debezium-connector-oracle/src/main/resources/ehcache/configuration-template.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config xmlns='http://www.ehcache.org/v3'>
+<config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://www.ehcache.org/v3' xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd">
+
+    <default-serializers>
+        <serializer type="io.debezium.connector.oracle.logminer.processor.ehcache.EhcacheTransaction">
+            io.debezium.connector.oracle.logminer.processor.ehcache.serialization.EhcacheTransactionSerializer
+        </serializer>
+        <serializer type="io.debezium.connector.oracle.logminer.events.LogMinerEvent">
+            io.debezium.connector.oracle.logminer.processor.ehcache.serialization.LogMinerEventSerializer
+        </serializer>
+    </default-serializers>
 
     <!--
         Defines the ehcache global configuration
@@ -43,13 +52,4 @@
         ${log.mining.buffer.ehcache.events.config}
     </cache>
 
-    <default-serializers>
-        <serializer type="io.debezium.connector.oracle.logminer.processor.ehcache.EhcacheTransaction">
-            io.debezium.connector.oracle.logminer.processor.ehcache.serialization.EhcacheTransactionSerializer
-        </serializer>
-        <serializer type="io.debezium.connector.oracle.logminer.events.LogMinerEvent">
-            io.debezium.connector.oracle.logminer.processor.ehcache.serialization.LogMinerEventSerializer
-        </serializer>
-    </default-serializers>
-
 </config>
\ No newline at end of file