From 386dad6562415b6d398f0e58b47a62562286e370 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 19 Feb 2021 12:28:53 -0500 Subject: [PATCH] Use compatible image version with Debezium * Fix MongoDb driver problem. Probably we need to think about upgrading Debezium support to the latest version, so its MongoDb connector is based on the latest Mongo Driver which already is pulled by Spring Boot --- .../source/cdc-debezium-source/pom.xml | 22 +++++++++++++++++++ .../CdcSourceDatabasesIntegrationTest.java | 11 ++++++---- .../cdc/CdcBootStarterIntegrationTest.java | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/applications/source/cdc-debezium-source/pom.xml b/applications/source/cdc-debezium-source/pom.xml index a6dd2755..1110eddd 100644 --- a/applications/source/cdc-debezium-source/pom.xml +++ b/applications/source/cdc-debezium-source/pom.xml @@ -92,6 +92,28 @@ org.testcontainers mysql + test + + + + org.mongodb + mongodb-driver + 3.12.7 + test + + + + org.mongodb + bson + 3.12.7 + test + + + + org.mongodb + mongodb-driver-core + 3.12.7 + test diff --git a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java index 5981fa51..164c065f 100644 --- a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java +++ b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2020 the original author or authors. + * Copyright 2020-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,8 +38,8 @@ import static org.springframework.cloud.stream.app.source.cdc.CdcTestUtils.recei /** * @author Christian Tzolov * @author David Turanski + * @author Artem Bilan */ -@Disabled("Run as needed if there is an issue with a specific connector") public class CdcSourceDatabasesIntegrationTest { private final SpringApplicationBuilder applicationBuilder = new SpringApplicationBuilder( @@ -82,6 +82,7 @@ public class CdcSourceDatabasesIntegrationTest { } @Test + @Disabled public void sqlServer() { GenericContainer sqlServer = new GenericContainer(new ImageFromDockerfile() .withFileFromClasspath("Dockerfile", "sqlserver/Dockerfile") @@ -140,9 +141,10 @@ public class CdcSourceDatabasesIntegrationTest { postgres.stop(); } - // @Test + @Test + @Disabled public void mongodb() { - GenericContainer mongodb = new GenericContainer("debezium/example-mongodb:1.0") + GenericContainer mongodb = new GenericContainer("debezium/example-mongodb:1.3") .withEnv("MONGODB_USER", "debezium") .withEnv("MONGODB_PASSWORD", "dbz") .withExposedPorts(27017); @@ -163,4 +165,5 @@ public class CdcSourceDatabasesIntegrationTest { } mongodb.stop(); } + } diff --git a/functions/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java b/functions/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java index 9e5287c8..f3db2d13 100644 --- a/functions/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java +++ b/functions/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java @@ -47,7 +47,7 @@ public class CdcBootStarterIntegrationTest { @Container static GenericContainer debeziumMySQL = - new GenericContainer<>(DockerImageName.parse("debezium/example-mysql")) + new GenericContainer<>(DockerImageName.parse("debezium/example-mysql:1.3")) .withEnv("MYSQL_ROOT_PASSWORD", "debezium") .withEnv("MYSQL_USER", "mysqluser") .withEnv("MYSQL_PASSWORD", "mysqlpw")