From 22cdc43da0f325ae5782b203a9befc0f1cc20de6 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 19 Nov 2024 09:41:58 -0500 Subject: [PATCH] Upgrade to Debezium `3.0.2` Fixes: https://github.com/spring-projects/spring-integration/pull/9651 * Use latest `debezium/example-mysql:3.0.0.Final` Docker image * Fix `DebeziumBatchTests` for initial DB initialization events: apparently new Debezium (even if it is a patch version) does not populate headers for those events --- build.gradle | 2 +- .../integration/debezium/DebeziumMySqlTestContainer.java | 2 +- .../integration/debezium/it/DebeziumBatchTests.java | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 7e102f9a2d..e92e325cf4 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ ext { commonsIoVersion = '2.17.0' commonsNetVersion = '3.11.1' curatorVersion = '5.7.1' - debeziumVersion = '3.0.1.Final' + debeziumVersion = '3.0.2.Final' derbyVersion = '10.16.1.1' ftpServerVersion = '1.2.0' graalvmVersion = '24.1.1' diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java index 80d6c318ab..359f530667 100644 --- a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java +++ b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/DebeziumMySqlTestContainer.java @@ -38,7 +38,7 @@ public interface DebeziumMySqlTestContainer { MySQLContainer DEBEZIUM_MYSQL = new MySQLContainer<>( - DockerImageName.parse("debezium/example-mysql:2.7.0.Final") + DockerImageName.parse("debezium/example-mysql:3.0.0.Final") .asCompatibleSubstituteFor("mysql")) .withUsername("mysqluser") .withPassword("mysqlpw"); diff --git a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java index a3630f30d5..a269dcfc23 100644 --- a/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java +++ b/spring-integration-debezium/src/test/java/org/springframework/integration/debezium/it/DebeziumBatchTests.java @@ -77,10 +77,7 @@ public class DebeziumBatchTests implements DebeziumMySqlTestContainer { .toList(); assertThat(changeEvent.destination()).startsWith("my-topic"); - if (i < 16) { - assertThat(headerKeys).hasSize(3).contains("__name", "__db", "__table"); - } - else { + if (i > 15) { assertThat(changeEvent.destination()).contains(".inventory"); assertThat(headerKeys).hasSize(4).contains("__name", "__db", "__op", "__table"); }