From 71bbb2a262f0215b4ed07f092e1d1a8d58f46806 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Mon, 9 Oct 2023 17:33:32 -0700
Subject: [PATCH] Fixes #7736

---
 dependencies/pom.xml          |  2 +-
 integrations/db/ojdbc/pom.xml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index fe01502b47f..d4aaeedd587 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -128,7 +128,7 @@
         <version.lib.netty>4.1.94.Final</version.lib.netty>
         <version.lib.netty-io_uring>0.0.8.Final</version.lib.netty-io_uring>
         <version.lib.oci>3.21.0</version.lib.oci>
-        <version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
+        <version.lib.ojdbc8>21.4.0.0</version.lib.ojdbc8>
         <!-- Force upgrade okio for CVE-2023-3635. When okhttp 4.12.0 is available we can remove this -->
         <version.lib.okio>3.4.0</version.lib.okio>
         <!-- Force upgrade okhttp3 for CVE-2023-0833 -->
diff --git a/integrations/db/ojdbc/pom.xml b/integrations/db/ojdbc/pom.xml
index ecf800709e4..eca63ddcbed 100644
--- a/integrations/db/ojdbc/pom.xml
+++ b/integrations/db/ojdbc/pom.xml
@@ -48,8 +48,20 @@
                     <groupId>com.oracle.database.jdbc</groupId>
                     <artifactId>ucp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- Contains JAXP impl, so we exclude it to not interfere -->
+                    <groupId>com.oracle.database.xml</groupId>
+                    <artifactId>xmlparserv2</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <!-- Include version without JAXP impl -->
+            <groupId>com.oracle.database.xml</groupId>
+            <artifactId>xmlparserv2_sans_jaxp_services</artifactId>
+            <version>${version.lib.ojdbc8}</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <profiles>