Return Oracle JDBC driver to the upstream

Closes #22999

docs/documentation/release_notes/topics/23_0_0.adoc

@@ -13,9 +13,3 @@ the latest FAPI 2 draft specifications when communicating with your clients. Tha
 
 Keycloak has preview for support for OAuth 2.0 Demonstrating Proof-of-Possession at the Application Layer (DPoP). Thanks to
 https://github.com/tnorimat[Takashi Norimatsu] and https://github.com/dteleguin[Dmitry Telegin] for their contributions.
-
-= Oracle Database driver not part of the distribution
-
-The Oracle Database JDBC driver is no longer part of the Keycloak distribution.
-Administrators will need to install a version of the Oracle Driver matching their environment
-as described in the configuring the database {section}.

docs/documentation/upgrading/topics/keycloak/changes-23_0_0.adoc

@@ -30,12 +30,6 @@ Previous versions of Keycloak supported specifying the encoding in the first lin
 Message properties files for themes are now read in UTF-8 encoding, with an automatic fallback to ISO-8859-1 encoding.
 If you are using a different encoding, convert the files to UTF-8.
 
-= Oracle Database driver not part of the distribution
-
-The Oracle Database JDBC driver is no longer part of the Keycloak distribution.
-Administrators will need to install a version of the Oracle Driver matching their environment
-as described in the configuring the database {section}.
-
 = Changes to the value format of claims mapped by the realm and client role mappers
 
 Before this release, both realm (`User Realm Role`) and client (`User Client Role`) protocol mappers

docs/guides/server/db.adoc

@@ -2,6 +2,7 @@
 <#import "/templates/kc.adoc" as kc>
 <#import "/templates/options.adoc" as opts>
 <#import "/templates/links.adoc" as links>
+<#import "/templates/profile.adoc" as profile>
 
 <@tmpl.guide
     title="Configuring the database"
@@ -28,6 +29,8 @@ The server has built-in support for different databases. You can query the avail
 By default, the server uses the `dev-file` database. This is the default database that the server will use to persist data and
 only exists for development use-cases. The `dev-file` database is not suitable for production use-cases, and must be replaced before deploying to production.
 
+<@profile.ifProduct>
+
 == Installing a database driver (Oracle)
 
 Database drivers are shipped as part of Keycloak except for the Oracle Database driver which needs to be installed separately.
@@ -68,6 +71,8 @@ See the <@links.server id="containers" /> {section} for details on how to build
 
 Then continue configuring the database as described in the next section.
 
+</@profile.ifProduct>
+
 == Configuring a database
 
 For each supported database, the server provides some opinionated defaults to simplify database configuration. You complete the configuration by providing some key settings such as the database host and credentials.

quarkus/runtime/pom.xml

@@ -78,16 +78,6 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-oracle</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.oracle.database.jdbc</groupId>
-                    <artifactId>ojdbc11</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.oracle.database.nls</groupId>
-                    <artifactId>orai18n</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -734,6 +724,30 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>product</id>
+            <activation>
+                <property>
+                    <name>product</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-oracle</artifactId>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.oracle.database.jdbc</groupId>
+                            <artifactId>ojdbc11</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.oracle.database.nls</groupId>
+                            <artifactId>orai18n</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>includeGelf</id>
             <activation>

quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java

@@ -85,8 +85,15 @@ class BuildCommandDistTest {
         CLIResult cliResult = (CLIResult) result;
 
         String dbDriver = Database.getDriver("oracle", true).orElse("");
+        String errorMessage = String.format("ERROR: Unable to find the JDBC driver (%s). You need to install it.", dbDriver);
 
-        cliResult.assertError(String.format("ERROR: Unable to find the JDBC driver (%s). You need to install it.", dbDriver));
+        boolean isProduct = System.getProperty("product") != null;
-        cliResult.assertNoBuild();
+        if (isProduct) {
+            cliResult.assertError(errorMessage);
+            cliResult.assertNoBuild();
+        } else {
+            cliResult.assertNoMessage(errorMessage);
+            cliResult.assertBuild();
+        }
     }
 }

testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml

@@ -186,31 +186,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>includeProprietaryDependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.oracle.database.jdbc</groupId>
-                                    <artifactId>ojdbc11</artifactId>
-                                    <version>${oracle-jdbc.version}</version>
-                                    <type>jar</type>
-                                    <outputDirectory>${auth.server.home}/providers</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.oracle.database.nls</groupId>
-                                    <artifactId>orai18n</artifactId>
-                                    <version>${oracle-jdbc.version}</version>
-                                    <type>jar</type>
-                                    <outputDirectory>${auth.server.home}/providers</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>copy-testsuite-providers</id>
                         <phase>generate-resources</phase>
@@ -363,5 +338,47 @@
 
         </profile>
 
+        <profile>
+            <id>product</id>
+            <activation>
+                <property>
+                    <name>product</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>includeProprietaryDependencies</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>com.oracle.database.jdbc</groupId>
+                                            <artifactId>ojdbc11</artifactId>
+                                            <version>${oracle-jdbc.version}</version>
+                                            <type>jar</type>
+                                            <outputDirectory>${auth.server.home}/providers</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.oracle.database.nls</groupId>
+                                            <artifactId>orai18n</artifactId>
+                                            <version>${oracle-jdbc.version}</version>
+                                            <type>jar</type>
+                                            <outputDirectory>${auth.server.home}/providers</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>