Remove Oracle JDBC driver out of the box

Closes: keycloak#29491 Co-authored-by: Václav Muzikář <[email protected]> Co-authored-by: Martin Bartoš <[email protected]> Signed-off-by: Peter Zaoral <[email protected]>
Pepo48 · May 31, 2024 · fc8dbe6 · fc8dbe6
1 parent 470412b
commit fc8dbe6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java
@@ -103,7 +103,7 @@ void testDoNotRecordRuntimeOptionsDuringBuild(KeycloakDistribution distribution)
     void missingOracleJdbcDriver(LaunchResult result) {
         CLIResult cliResult = (CLIResult) result;
 
-        String dbDriver = Database.getDriver("oracle", true).orElse("");
+        String dbDriver = Database.getDriver("oracle", false).orElse("");
         cliResult.assertError(String.format("ERROR: Unable to find the JDBC driver (%s). You need to install it.", dbDriver));
         cliResult.assertNoBuild();
     }

diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java
@@ -17,12 +17,18 @@
 
 package org.keycloak.it.storage.database;
 
+import org.keycloak.it.junit5.extension.BeforeStartDistribution;
 import org.keycloak.it.junit5.extension.CLIResult;
 import org.keycloak.it.junit5.extension.CLITest;
 import org.keycloak.it.junit5.extension.WithDatabase;
+import org.keycloak.it.utils.KeycloakDistribution;
+import org.keycloak.it.utils.RawKeycloakDistribution;
+
+import java.util.function.Consumer;
 
 @CLITest
 @WithDatabase(alias = "oracle")
+@BeforeStartDistribution(OracleTest.CopyOracleJdbcDriver.class)
 public class OracleTest extends BasicDatabaseTest {
 
     @Override
@@ -34,4 +40,14 @@ protected void assertWrongUsername(CLIResult cliResult) {
     protected void assertWrongPassword(CLIResult cliResult) {
         cliResult.assertMessage("ORA-01017: invalid username/password; logon denied");
     }
+
+    public static class CopyOracleJdbcDriver implements Consumer<KeycloakDistribution> {
+
+        @Override
+        public void accept(KeycloakDistribution distribution) {
+            RawKeycloakDistribution rawDist = distribution.unwrap(RawKeycloakDistribution.class);
+            rawDist.copyProvider("com.oracle.database.jdbc", "ojdbc11");
+            rawDist.copyProvider("com.oracle.database.nls", "orai18n");
+        }
+    }
 }
diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java
@@ -460,8 +460,6 @@ private Path prepareDistribution() {
                 if (System.getProperty("product") != null) {
                     // JDBC drivers might be excluded if running as a product build
                     copyProvider(dPath, "com.microsoft.sqlserver", "mssql-jdbc");
-                    copyProvider(dPath, "com.oracle.database.jdbc", "ojdbc11");
-                    copyProvider(dPath, "com.oracle.database.nls", "orai18n");
                 }
             }