diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml index 136d3e95..35a05d9a 100644 --- a/debezium-server-iceberg-sink/pom.xml +++ b/debezium-server-iceberg-sink/pom.xml @@ -212,11 +212,11 @@ - + - org.antlr - antlr4-runtime - ${version.antlr} + jakarta.servlet + jakarta.servlet-api + 5.0.0 test @@ -251,13 +251,13 @@ org.apache.iceberg - iceberg-spark-${version.spark.major}_${version.spark.scala} + iceberg-spark-${version.spark.major.iceebrgtemp}_${version.spark.scala} ${version.iceberg} test org.apache.iceberg - iceberg-spark-extensions-${version.spark.major}_${version.spark.scala} + iceberg-spark-extensions-${version.spark.major.iceebrgtemp}_${version.spark.scala} ${version.iceberg} test diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java index 80850aa7..22b515bf 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java @@ -31,7 +31,6 @@ * @author Ismail Simsek */ @QuarkusTest -@Disabled // @TODO remove spark with antlr4 version @QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) @QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) @TestProfile(IcebergChangeConsumerMysqlTest.TestProfile.class) diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java index a4b31aa1..1d167c3b 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java @@ -10,6 +10,7 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; +import io.debezium.server.iceberg.testresources.SourceMysqlDB; import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; @@ -33,7 +34,7 @@ */ @QuarkusTest @QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourcePostgresqlDB.class, restrictToAnnotatedClass = true) +@QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) @TestProfile(IcebergEventsChangeConsumerTest.TestProfile.class) public class IcebergEventsChangeConsumerTest extends BaseSparkTest { @ConfigProperty(name = "debezium.sink.type") @@ -61,8 +62,16 @@ public static class TestProfile implements QuarkusTestProfile { public Map getConfigOverrides() { Map config = new HashMap<>(); config.put("debezium.sink.type", "icebergevents"); + config.put("quarkus.profile", "mysql"); + config.put("%mysql.debezium.source.connector.class", "io.debezium.connector.mysql.MySqlConnector"); + config.put("%mysql.debezium.source.table.whitelist", "inventory.customers,inventory.test_delete_table"); return config; } + + @Override + public String getConfigProfile() { + return "mysql"; + } } } diff --git a/pom.xml b/pom.xml index 5a6095fb..792ce151 100644 --- a/pom.xml +++ b/pom.xml @@ -34,9 +34,10 @@ 1.5.2 - 3.5 + 4.0 + 3.5 2.13 - ${version.spark.major}.1 + ${version.spark.major}.0-preview1 3.3.6 3.1.3 2.2.20 @@ -46,13 +47,11 @@ 8.0.32 3.10.0 - - 4.9.3 - iceberg-stg-repo - https://repository.apache.org/content/repositories/orgapacheiceberg-1163/ + orgapachespark-stg-repo + https://repository.apache.org/content/repositories/orgapachespark-1454/