From 9b3a12f168e1ae2057c99e0ee94e4d3ab140192f Mon Sep 17 00:00:00 2001
From: Jiri Pechanec <jpechane@redhat.com>
Date: Thu, 30 Sep 2021 13:53:53 +0200
Subject: [PATCH] DBZ-4049 Override Quarkus JDBC drivers

---
 debezium-bom/pom.xml                        | 10 ----------
 debezium-server/debezium-server-bom/pom.xml | 12 ++++++++++++
 pom.xml                                     | 12 +++++++++++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml
index e65147e67..fd264b3ec 100644
--- a/debezium-bom/pom.xml
+++ b/debezium-bom/pom.xml
@@ -16,16 +16,6 @@
         <version.confluent.platform>6.0.2</version.confluent.platform>
         <version.apicurio>2.0.0.Final</version.apicurio>
 
-        <!-- Database drivers, should align with databases in debezium-build-parent -->
-        <version.postgresql.driver>42.2.14</version.postgresql.driver>
-        <version.mysql.driver>8.0.26</version.mysql.driver>
-        <version.mysql.binlog>0.25.3</version.mysql.binlog>
-        <version.mongo.driver>4.2.1</version.mongo.driver>
-        <version.sqlserver.driver>7.2.2.jre8</version.sqlserver.driver>
-        <version.oracle.driver>21.1.0.0</version.oracle.driver>
-        <version.db2.driver>11.5.0.0</version.db2.driver>
-        <version.cassandra.driver>3.11.0</version.cassandra.driver>
-
         <!-- Connectors -->
         <version.com.google.protobuf>3.8.0</version.com.google.protobuf>
         <version.dropwizard>4.0.1</version.dropwizard>
diff --git a/debezium-server/debezium-server-bom/pom.xml b/debezium-server/debezium-server-bom/pom.xml
index e10bb13a8..d632f57d9 100644
--- a/debezium-server/debezium-server-bom/pom.xml
+++ b/debezium-server/debezium-server-bom/pom.xml
@@ -49,6 +49,18 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Override Quarkus default driver versions -->
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${version.mysql.driver}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${version.postgresql.driver}</version>
+            </dependency>
+
             <!-- Debezium dependencies -->
             <dependency>
                 <groupId>io.debezium</groupId>
diff --git a/pom.xml b/pom.xml
index 5f2871be3..be0e8b9da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,17 @@
         <!-- Quarkus -->
         <quarkus.version>2.0.0.Final</quarkus.version>
 
-        <!-- Databases, should align with database drivers in debezium-bom -->
+        <!-- Database drivers, should align with databases -->
+        <version.postgresql.driver>42.2.14</version.postgresql.driver>
+        <version.mysql.driver>8.0.26</version.mysql.driver>
+        <version.mysql.binlog>0.25.3</version.mysql.binlog>
+        <version.mongo.driver>4.2.1</version.mongo.driver>
+        <version.sqlserver.driver>7.2.2.jre8</version.sqlserver.driver>
+        <version.oracle.driver>21.1.0.0</version.oracle.driver>
+        <version.db2.driver>11.5.0.0</version.db2.driver>
+        <version.cassandra.driver>3.11.0</version.cassandra.driver>
+
+        <!-- Databases, should align with database drivers -->
         <version.mysql.server>5.7</version.mysql.server>
         <version.mongo.server>3.6</version.mongo.server>
         <version.cassandra>3.11.10</version.cassandra>