Quarkus IT that use Oracle DB don't work with -Dproduct (#23088)

Fixes #23058
keycloak · Sep 8, 2023 · 1d15f1e · 1d15f1e
1 parent f52af8d
commit 1d15f1e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/quarkus/tests/integration/pom.xml b/quarkus/tests/integration/pom.xml
@@ -71,11 +71,23 @@
             <artifactId>bctls-fips</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- JDBC Drivers -->
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
         <dependency>

diff --git a/quarkus/tests/junit5/pom.xml b/quarkus/tests/junit5/pom.xml
@@ -92,10 +92,21 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>mssqlserver</artifactId>
         </dependency>
+
+        <!-- JDBC Drivers -->
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http-shared</artifactId>

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
@@ -389,9 +389,12 @@ private Path prepareDistribution() {
             if (!inited || (reCreate || !dPath.toFile().exists())) {
                 FileUtil.deleteDirectory(dPath);
                 ZipUtils.unzip(distFile.toPath(), distRootPath);
+
                 if (System.getProperty("product") != null) {
-                    // MS SQL Server driver might be excluded if running as a product build
+                    // 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");
                 }
             }