Skip to content

Commit cd41acd

Browse files
Change ojdbc8 scope to provided to prevent transitive dependency conflicts
1 parent 455f634 commit cd41acd

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

ojdbc-provider-azure/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<groupId>com.oracle.database.jdbc</groupId>
3131
<artifactId>ojdbc-provider-common</artifactId>
3232
</dependency>
33+
<dependency>
34+
<groupId>com.oracle.database.jdbc</groupId>
35+
<artifactId>ojdbc8</artifactId>
36+
</dependency>
3337
<dependency>
3438
<groupId>com.azure</groupId>
3539
<artifactId>azure-core</artifactId>

ojdbc-provider-gcp/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747

4848
<!-- TEST DEPENDENCIES -->
4949

50-
<dependency>
51-
<groupId>com.oracle.database.jdbc</groupId>
52-
<artifactId>ojdbc-provider-common</artifactId>
53-
<classifier>tests</classifier>
54-
<type>test-jar</type>
55-
</dependency>
5650
<dependency>
5751
<groupId>com.oracle.database.jdbc</groupId>
5852
<artifactId>ojdbc-provider-common</artifactId>

ojdbc-provider-hashicorp/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<groupId>com.oracle.database.jdbc</groupId>
2020
<artifactId>ojdbc-provider-common</artifactId>
2121
</dependency>
22+
<dependency>
23+
<groupId>com.oracle.database.jdbc</groupId>
24+
<artifactId>ojdbc8</artifactId>
25+
</dependency>
2226

2327
<dependency>
2428
<groupId>com.oracle.database.jdbc</groupId>

ojdbc-provider-samples/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<artifactId>ojdbc-provider-hashicorp</artifactId>
5151
<version>${project.parent.version}</version>
5252
</dependency>
53+
<dependency>
54+
<groupId>com.oracle.database.jdbc</groupId>
55+
<artifactId>ojdbc8</artifactId>
56+
</dependency>
5357
<dependency>
5458
<groupId>com.oracle.database.security</groupId>
5559
<artifactId>oraclepki</artifactId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<groupId>com.oracle.database.jdbc</groupId>
7979
<artifactId>ojdbc8</artifactId>
8080
<version>${jdbc.version}</version>
81+
<scope>provided</scope>
8182
</dependency>
8283
<dependency>
8384
<groupId>com.oracle.database.security</groupId>

0 commit comments

Comments
 (0)