From db35aca876836e2f1dd98234818a696b276b99f8 Mon Sep 17 00:00:00 2001
From: Laird Nelson <laird.nelson@oracle.com>
Date: Thu, 21 Nov 2024 11:16:09 -0800
Subject: [PATCH] Changes dependencies on various Oracle JDBC artifacts from
 their compiled-with-Java-11 variants to their compiled-with-Java-17 variants

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
---
 .../src/main/archetype/mp/custom/database-outputs.xml      | 2 +-
 dependencies/pom.xml                                       | 7 +++++++
 integrations/cdi/datasource-ucp/pom.xml                    | 2 +-
 integrations/db/ojdbc/pom.xml                              | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml b/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml
index d4ce58570fc..76fc3a2f0c7 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml
@@ -364,7 +364,7 @@ For details on an Oracle Docker image, see https://github.com/oracle/docker-imag
                         </map>
                         <map>
                             <value key="groupId">com.oracle.database.jdbc</value>
-                            <value key="artifactId">ucp11</value>
+                            <value key="artifactId">ucp17</value>
                             <value key="scope">runtime</value>
                         </map>
                     </list>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 3878b44a852..71db89ae8ef 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1410,6 +1410,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- The ojdbc-bom as of this writing does not "cover" ojdbc17-production:pom. Add that here temporarily. -->
+            <dependency>
+                <groupId>com.oracle.database.jdbc</groupId>
+                <artifactId>ojdbc17-production</artifactId>
+                <version>${version.lib.ojdbc}</version>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
diff --git a/integrations/cdi/datasource-ucp/pom.xml b/integrations/cdi/datasource-ucp/pom.xml
index c06979ef2d8..38f32ae16ad 100644
--- a/integrations/cdi/datasource-ucp/pom.xml
+++ b/integrations/cdi/datasource-ucp/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ucp11</artifactId>
+            <artifactId>ucp17</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/integrations/db/ojdbc/pom.xml b/integrations/db/ojdbc/pom.xml
index 3adf6549cdf..6ca2fc7575b 100644
--- a/integrations/db/ojdbc/pom.xml
+++ b/integrations/db/ojdbc/pom.xml
@@ -41,12 +41,12 @@
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc11-production</artifactId>
+            <artifactId>ojdbc17-production</artifactId>
             <type>pom</type>
             <exclusions>
                 <exclusion>
                     <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ucp11</artifactId>
+                    <artifactId>ucp17</artifactId>
                 </exclusion>
                 <exclusion>
                     <!-- Contains JAXP impl, so we exclude it to not interfere -->