Use the same Oracle driver for the tests and Undertow like for Quarkus

Closes #15576
This commit is contained in:
Alexander Schwartz 2022-11-18 17:50:21 +01:00 committed by Hynek Mlnařík
parent 9025ec16f0
commit fb315b57c3
4 changed files with 15 additions and 14 deletions

View file

@ -74,18 +74,11 @@ Note that you must always activate the `jpa` profile when using auth-server-quar
If the mvn command fails for any reason, it may also fail to remove the container which If the mvn command fails for any reason, it may also fail to remove the container which
must be then removed manually. must be then removed manually.
For Oracle databases, neither JDBC driver nor the image are publicly available For Oracle databases, the images are not publicly available due to licensing restrictions.
due to licensing restrictions and require preparation of the environment. You
first need to download the JDBC driver and install it to your local maven repo
(feel free to specify GAV and file according to the one you would download):
mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc7 -Dversion=12.1.0 -Dpackaging=jar -Dfile=ojdbc7.jar -DgeneratePom=true Build the Docker image per instructions at
https://github.com/oracle/docker-images/tree/main/OracleDatabase.
Then build the Docker image per instructions at Update the property `docker.database.image` if you used a different
https://github.com/oracle/docker-images/tree/main/OracleDatabase. The last
step is running which might require updating the `jdbc.mvn.groupId`,
`jdbc.mvn.artifactId`, and `jdbc.mvn.version` according to the parameters you
used in the command above, and `docker.database.image` if you used a different
name or tag for the image. name or tag for the image.
Note that Docker containers may occupy some space even after termination, and Note that Docker containers may occupy some space even after termination, and

View file

@ -149,6 +149,8 @@
<mariadb.driver.version>2.7.2</mariadb.driver.version> <mariadb.driver.version>2.7.2</mariadb.driver.version>
<mssql.version>2019-CU10-ubuntu-20.04</mssql.version> <mssql.version>2019-CU10-ubuntu-20.04</mssql.version>
<mssql.driver.version>9.2.0.jre8</mssql.driver.version> <mssql.driver.version>9.2.0.jre8</mssql.driver.version>
<!-- this is the oracle driver version also used in the Quarkus BOM -->
<oracle.driver.version>21.5.0.0</oracle.driver.version>
<!-- Test --> <!-- Test -->
<greenmail.version>1.3.1b</greenmail.version> <greenmail.version>1.3.1b</greenmail.version>

View file

@ -605,9 +605,9 @@
<!-- JDBC properties point to "default" JDBC driver for the particular DB --> <!-- JDBC properties point to "default" JDBC driver for the particular DB -->
<!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver --> <!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver -->
<!-- for the particular EAP version --> <!-- for the particular EAP version -->
<jdbc.mvn.groupId>com.oracle</jdbc.mvn.groupId> <jdbc.mvn.groupId>com.oracle.database.jdbc</jdbc.mvn.groupId>
<jdbc.mvn.artifactId>ojdbc7</jdbc.mvn.artifactId> <jdbc.mvn.artifactId>ojdbc11</jdbc.mvn.artifactId>
<jdbc.mvn.version>12.1.0</jdbc.mvn.version> <jdbc.mvn.version>${oracle.driver.version}</jdbc.mvn.version>
</properties> </properties>
</profile> </profile>
<profile> <profile>

View file

@ -256,6 +256,12 @@
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>${postgresql.driver.version}</version> <version>${postgresql.driver.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.driver.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>