From 12921357292fc2d69982e944df0db3a20dfb6873 Mon Sep 17 00:00:00 2001
From: Tomas Kyjovsky <tkyjovsk@redhat.com>
Date: Thu, 4 Mar 2021 02:39:47 +0100
Subject: [PATCH] KEYCLOAK-17322 Align tested databases with EAP 7.4 support
 matrix

---
 pom.xml                                       | 16 ++++--
 quarkus/pom.xml                               |  8 +--
 testsuite/integration-arquillian/pom.xml      | 55 +++++--------------
 .../integration-arquillian/tests/base/pom.xml |  1 +
 testsuite/utils/pom.xml                       |  4 +-
 5 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78d71b61c1..802d19b3b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,17 +128,23 @@
 
         <jetty9.version>${jetty92.version}</jetty9.version>
         <liquibase.version>3.5.5</liquibase.version>
-        <mysql.version>8.0.23</mysql.version>
         <osgi.version>4.2.0</osgi.version>
         <pax.web.version>7.1.0</pax.web.version>
-        <postgresql.version>42.2.18</postgresql.version>
-        <mariadb.version>2.2.4</mariadb.version>
-        <mssql.version>7.4.1.jre8</mssql.version>
         <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
         <servlet.api.40.version>2.0.0.Final</servlet.api.40.version>
         <twitter4j.version>4.0.7</twitter4j.version>
         <jna.version>4.1.0</jna.version>
 
+        <!-- Databases -->
+        <mysql.version>8.0.23</mysql.version>
+        <mysql.driver.version>8.0.23</mysql.driver.version>
+        <postgresql.version>13.2</postgresql.version>
+        <postgresql.driver.version>42.2.18</postgresql.driver.version>
+        <mariadb.version>10.3.27</mariadb.version>
+        <mariadb.driver.version>2.7.2</mariadb.driver.version>
+        <mssql.version>2019-CU10-ubuntu-20.04</mssql.version>
+        <mssql.driver.version>9.2.0.jre8</mssql.driver.version>
+
         <!-- Test -->
         <greenmail.version>1.3.1b</greenmail.version>
         <hamcrest.version>1.3</hamcrest.version>
@@ -682,7 +688,7 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
+                <version>${mysql.driver.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index 244fdc8f3c..89995e3022 100755
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -36,8 +36,8 @@
         <jackson.version>2.12.1</jackson.version>
         <jackson.databind.version>${jackson.version}</jackson.databind.version>
         <hibernate.version>5.4.29.Final</hibernate.version>
-        <mysql-connector-java.version>8.0.24</mysql-connector-java.version>
-        <postgresql.version>42.2.20</postgresql.version>
+        <mysql.driver.version>8.0.24</mysql.driver.version>
+        <postgresql.driver.version>42.2.20</postgresql.driver.version>
         <picocli.version>4.6.1</picocli.version>
         <snakeyaml.version>1.28</snakeyaml.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
@@ -98,12 +98,12 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql-connector-java.version}</version>
+                <version>${mysql.driver.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>${postgresql.version}</version>
+                <version>${postgresql.driver.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.checkerframework</groupId>
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 78b1e05d6c..5dc40b2c92 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -457,8 +457,8 @@
                 <!-- for the particular EAP version -->
                 <jdbc.mvn.groupId>mysql</jdbc.mvn.groupId>
                 <jdbc.mvn.artifactId>mysql-connector-java</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${mysql.version}</jdbc.mvn.version>
-                <docker.database.image>mysql:8.0.18</docker.database.image>
+                <jdbc.mvn.version>${mysql.driver.version}</jdbc.mvn.version>
+                <docker.database.image>mysql:${mysql.version}</docker.database.image>
                 <docker.database.port>3306</docker.database.port>
                 <docker.database.skip>false</docker.database.skip>
                 <docker.database.cmd>mysqld</docker.database.cmd>
@@ -485,29 +485,8 @@
                 <!-- for the particular EAP version -->
                 <jdbc.mvn.groupId>org.postgresql</jdbc.mvn.groupId>
                 <jdbc.mvn.artifactId>postgresql</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${postgresql.version}</jdbc.mvn.version>
-                <docker.database.image>postgres:11.5</docker.database.image>
-                <docker.database.port>5432</docker.database.port>
-                <docker.database.skip>false</docker.database.skip>
-                <docker.database.cmd>postgres</docker.database.cmd>
-                <docker.database.wait-for-log-regex>(?si)Ready for start up.*ready [^\n]{0,30}connections</docker.database.wait-for-log-regex>
-            </properties>
-        </profile>
-        <profile>
-            <id>db-postgres10</id>
-            <properties>
-                <keycloak.connectionsJpa.driver>org.postgresql.Driver</keycloak.connectionsJpa.driver>
-                <keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
-                <keycloak.connectionsJpa.user>keycloak</keycloak.connectionsJpa.user>
-                <keycloak.connectionsJpa.password>keycloak</keycloak.connectionsJpa.password>
-                <keycloak.connectionsJpa.url>jdbc:postgresql://${auth.server.db.host}/${keycloak.connectionsJpa.database}</keycloak.connectionsJpa.url>
-                <!-- 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 the particular EAP version -->
-                <jdbc.mvn.groupId>org.postgresql</jdbc.mvn.groupId>
-                <jdbc.mvn.artifactId>postgresql</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>42.2.2</jdbc.mvn.version>
-                <docker.database.image>postgres:10</docker.database.image>
+                <jdbc.mvn.version>${postgresql.driver.version}</jdbc.mvn.version>
+                <docker.database.image>postgres:${postgresql.version}</docker.database.image>
                 <docker.database.port>5432</docker.database.port>
                 <docker.database.skip>false</docker.database.skip>
                 <docker.database.cmd>postgres</docker.database.cmd>
@@ -517,20 +496,14 @@
         <profile>
             <id>db-allocator-db-postgres</id>
             <properties>
-                <!-- 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 the particular EAP version -->
-                <jdbc.mvn.groupId>org.postgresql</jdbc.mvn.groupId>
-                <jdbc.mvn.artifactId>postgresql</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${postgresql.version}</jdbc.mvn.version>
-                <dballocator.type>postgresql115</dballocator.type>
+                <dballocator.type>postgresql132</dballocator.type>
                 <dballocator.skip>false</dballocator.skip>
             </properties>
         </profile>
         <profile>
             <id>db-allocator-db-postgresplus</id>
             <properties>
-                <dballocator.type>postgresplus101</dballocator.type>
+                <dballocator.type>postgresplus131</dballocator.type>
                 <dballocator.skip>false</dballocator.skip>
             </properties>
         </profile>
@@ -547,8 +520,8 @@
                 <!-- for the particular EAP version -->
                 <jdbc.mvn.groupId>org.mariadb.jdbc</jdbc.mvn.groupId>
                 <jdbc.mvn.artifactId>mariadb-java-client</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${mariadb.version}</jdbc.mvn.version>
-                <docker.database.image>mariadb:10.1.19</docker.database.image>
+                <jdbc.mvn.version>${mariadb.driver.version}</jdbc.mvn.version>
+                <docker.database.image>mariadb:${mariadb.version}</docker.database.image>
                 <docker.database.port>3306</docker.database.port>
                 <docker.database.skip>false</docker.database.skip>
                 <!-- Need to explicitly enable utf8 as it is not the default settings in the mariadb docker image -->
@@ -559,14 +532,14 @@
         <profile>
             <id>db-allocator-db-mariadb</id>
             <properties>
-                <dballocator.type>mariadb_galera_101</dballocator.type>
+                <dballocator.type>mariadb_galera_103</dballocator.type>
                 <dballocator.skip>false</dballocator.skip>
             </properties>
         </profile>
         <profile>
-            <id>db-mssql2017</id>
+            <id>db-mssql</id>
             <properties>
-                <docker.database.image>microsoft/mssql-server-linux:2017-GA</docker.database.image>
+                <docker.database.image>mcr.microsoft.com/mssql/server:${mssql.version}</docker.database.image>
                 <docker.database.port>1433</docker.database.port>
                 <docker.database.skip>false</docker.database.skip>
                 <docker.database.postStart>/opt/mssql-tools/bin/sqlcmd -e -U sa -P vEry5tron9Pwd -d master -Q CREATE\ DATABASE\ ${keycloak.connectionsJpa.database}</docker.database.postStart>
@@ -582,13 +555,13 @@
                 <!-- for the particular EAP version -->
                 <jdbc.mvn.groupId>com.microsoft.sqlserver</jdbc.mvn.groupId>
                 <jdbc.mvn.artifactId>mssql-jdbc</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${mssql.version}</jdbc.mvn.version>
+                <jdbc.mvn.version>${mssql.driver.version}</jdbc.mvn.version>
             </properties>
         </profile>
         <profile>
-            <id>db-allocator-db-mssql2017</id>
+            <id>db-allocator-db-mssql2019</id>
             <properties>
-                <dballocator.type>mssql2017</dballocator.type>
+                <dballocator.type>mssql2019</dballocator.type>
                 <dballocator.skip>false</dballocator.skip>
             </properties>
         </profile>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 76c8c15a2e..ace200ddbf 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -372,6 +372,7 @@
                                             <time>300000</time>
                                             <exec>
                                               <postStart>${docker.database.postStart}</postStart>
+                                              <breakOnError>true</breakOnError>
                                             </exec>
                                         </wait>
                                     </run>
diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml
index ed3821dc87..8cc18c2e4d 100755
--- a/testsuite/utils/pom.xml
+++ b/testsuite/utils/pom.xml
@@ -242,12 +242,12 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>${postgresql.version}</version>
+            <version>${postgresql.driver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>${mariadb.version}</version>
+            <version>${mariadb.driver.version}</version>
         </dependency>
     </dependencies>