From cd41acdb748a30b4e2b1b7448f36ee1664f4c321 Mon Sep 17 00:00:00 2001
From: Mouhsin Elmajdouby <mouhsin.e.elmajdouby@oracle.com>
Date: Wed, 6 Aug 2025 15:59:58 +0100
Subject: [PATCH] Change ojdbc8 scope to provided to prevent transitive
 dependency conflicts

---
 ojdbc-provider-azure/pom.xml     | 4 ++++
 ojdbc-provider-gcp/pom.xml       | 6 ------
 ojdbc-provider-hashicorp/pom.xml | 4 ++++
 ojdbc-provider-samples/pom.xml   | 4 ++++
 pom.xml                          | 1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ojdbc-provider-azure/pom.xml b/ojdbc-provider-azure/pom.xml
index 0525cee9..d1492a86 100644
--- a/ojdbc-provider-azure/pom.xml
+++ b/ojdbc-provider-azure/pom.xml
@@ -30,6 +30,10 @@
       <groupId>com.oracle.database.jdbc</groupId>
       <artifactId>ojdbc-provider-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
diff --git a/ojdbc-provider-gcp/pom.xml b/ojdbc-provider-gcp/pom.xml
index 7c84905d..7d04dd84 100644
--- a/ojdbc-provider-gcp/pom.xml
+++ b/ojdbc-provider-gcp/pom.xml
@@ -47,12 +47,6 @@
 
     <!-- TEST DEPENDENCIES -->
 
-    <dependency>
-      <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc-provider-common</artifactId>
-      <classifier>tests</classifier>
-      <type>test-jar</type>
-    </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
       <artifactId>ojdbc-provider-common</artifactId>
diff --git a/ojdbc-provider-hashicorp/pom.xml b/ojdbc-provider-hashicorp/pom.xml
index 3f4ef6ef..f9051092 100644
--- a/ojdbc-provider-hashicorp/pom.xml
+++ b/ojdbc-provider-hashicorp/pom.xml
@@ -19,6 +19,10 @@
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc-provider-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
diff --git a/ojdbc-provider-samples/pom.xml b/ojdbc-provider-samples/pom.xml
index ecc5582e..de87b65a 100644
--- a/ojdbc-provider-samples/pom.xml
+++ b/ojdbc-provider-samples/pom.xml
@@ -50,6 +50,10 @@
       <artifactId>ojdbc-provider-hashicorp</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.oracle.database.security</groupId>
       <artifactId>oraclepki</artifactId>
diff --git a/pom.xml b/pom.xml
index f55e7c49..30fec32d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
         <groupId>com.oracle.database.jdbc</groupId>
         <artifactId>ojdbc8</artifactId>
         <version>${jdbc.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>com.oracle.database.security</groupId>