Skip to content

Commit 69c66a9

Browse files
authored
Merge pull request #46029 from suppen-kaspar/feat/update-to-ojdbc17
Update Oracle Driver to 23.6.0.24.10 and switch to ojdbc17
2 parents b3e5f84 + ab4e4e0 commit 69c66a9

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
124124
<mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
125125
<adal4j.version>1.6.7</adal4j.version>
126-
<oracle-jdbc.version>23.5.0.24.07</oracle-jdbc.version>
126+
<oracle-jdbc.version>23.6.0.24.10</oracle-jdbc.version>
127127
<derby-jdbc.version>10.16.1.1</derby-jdbc.version>
128128
<db2-jdbc.version>12.1.0.0</db2-jdbc.version>
129129
<shrinkwrap.version>1.2.6</shrinkwrap.version>

extensions/devservices/oracle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>com.oracle.database.jdbc</groupId>
35-
<artifactId>ojdbc11</artifactId>
35+
<artifactId>ojdbc17</artifactId>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.junit.jupiter</groupId>

extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> run
130130
//referring to various other types which aren't allowed in a captured heap.
131131
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.diagnostics.Diagnostic"));
132132
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.replay.driver.FailoverManagerImpl"));
133+
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.diagnostics.AbstractDiagnosable"));
134+
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.AbstractTrueCacheConnectionPools"));
133135
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.diagnostics.CommonDiagnosable"));
134136
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.replay.driver.TxnFailoverManagerImpl"));
135137
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.diagnostics.OracleDiagnosticsMXBean"));
@@ -152,7 +154,7 @@ NativeImageAllowIncompleteClasspathBuildItem naughtyDriver() {
152154

153155
@BuildStep
154156
RemovedResourceBuildItem enhancedCharsetSubstitutions() {
155-
return new RemovedResourceBuildItem(ArtifactKey.fromString("com.oracle.database.jdbc:ojdbc11"),
157+
return new RemovedResourceBuildItem(ArtifactKey.fromString("com.oracle.database.jdbc:ojdbc17"),
156158
Collections.singleton("oracle/nativeimage/CharacterSetFeature.class"));
157159
}
158160

extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class RegexMatchTest {
1919

2020
@Test
2121
public void jarRegexIsMatching() {
22-
final String EXAMPLE_CLASSPATH = "/home/sanne/sources/quarkus/integration-tests/jpa-oracle/target/quarkus-integration-test-jpa-oracle-999-SNAPSHOT-native-image-source-jar/lib/com.oracle.database.jdbc.ojdbc11-21.3.0.0.jar";
22+
final String EXAMPLE_CLASSPATH = "/home/sanne/sources/quarkus/integration-tests/jpa-oracle/target/quarkus-integration-test-jpa-oracle-999-SNAPSHOT-native-image-source-jar/lib/com.oracle.database.jdbc.ojdbc17-23.6.0.24.10.jar";
2323
final Pattern pattern = Pattern.compile(OracleMetadataOverrides.DRIVER_JAR_MATCH_REGEX);
2424
final Matcher matcher = pattern.matcher(EXAMPLE_CLASSPATH);
2525
Assert.assertTrue(matcher.find());

extensions/jdbc/jdbc-oracle/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>com.oracle.database.jdbc</groupId>
26-
<artifactId>ojdbc11</artifactId>
26+
<artifactId>ojdbc17</artifactId>
2727
</dependency>
2828
<dependency>
2929
<groupId>com.oracle.database.nls</groupId>

extensions/reactive-oracle-client/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>com.oracle.database.jdbc</groupId>
30-
<artifactId>ojdbc11</artifactId>
30+
<artifactId>ojdbc17</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>io.quarkus</groupId>

0 commit comments

Comments
 (0)