This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8482da99fb98352b5898e5efce16f665ec991cfd Author: JiriOndrusek <[email protected]> AuthorDate: Fri Aug 15 20:23:18 2025 +0200 Fix Debezium native support --- .../deployment/DebeziumSupportProcessor.java | 125 +++++++++++++++++---- .../debezium/graal/MBeansSubstitutions.java | 23 +++- .../deployment/DebeziumMongodbProcessor.java | 21 +++- .../mysql/deployment/DebeziumMysqlProcessor.java | 15 ++- .../oracle/deployment/DebeziumOracleProcessor.java | 23 +++- .../deployment/DebeziumPostgresProcessor.java | 12 +- .../deployment/DebeziumSqlserverProcessor.java | 13 +++ integration-test-groups/debezium/mongodb/pom.xml | 2 - .../common/it/mongodb/DebeziumMongodbIT.java | 2 - integration-test-groups/debezium/mssql/pom.xml | 6 +- .../common/it/sqlserv/DebeziumSqlserverIT.java | 2 - integration-test-groups/debezium/mysql/pom.xml | 2 - .../debezium/common/it/mysql/DebeziumMysqlIT.java | 2 - integration-test-groups/debezium/oracle/pom.xml | 2 - .../common/it/postgres/DebeziumOracleIT.java | 2 +- .../debezium/postgresql/pom.xml | 2 - .../common/it/postgres/DebeziumPostgresIT.java | 2 - .../common/it/postgres/DebeziumPostgresTest.java | 3 - integration-tests/debezium-grouped/pom.xml | 2 - 19 files changed, 197 insertions(+), 64 deletions(-) diff --git a/extensions-support/debezium/deployment/src/main/java/org/apache/camel/quarkus/support/debezium/deployment/DebeziumSupportProcessor.java b/extensions-support/debezium/deployment/src/main/java/org/apache/camel/quarkus/support/debezium/deployment/DebeziumSupportProcessor.java index 171c1759a8..0907a88742 100644 --- a/extensions-support/debezium/deployment/src/main/java/org/apache/camel/quarkus/support/debezium/deployment/DebeziumSupportProcessor.java +++ b/extensions-support/debezium/deployment/src/main/java/org/apache/camel/quarkus/support/debezium/deployment/DebeziumSupportProcessor.java @@ -16,6 +16,33 @@ */ package org.apache.camel.quarkus.support.debezium.deployment; +import io.debezium.connector.common.BaseSourceTask; +import io.debezium.embedded.async.ConvertingAsyncEngineBuilderFactory; +import io.debezium.engine.DebeziumEngine; +import io.debezium.pipeline.notification.channels.LogNotificationChannel; +import io.debezium.pipeline.notification.channels.SinkNotificationChannel; +import io.debezium.pipeline.notification.channels.jmx.JmxNotificationChannel; +import io.debezium.pipeline.signal.actions.StandardActionProvider; +import io.debezium.pipeline.signal.channels.FileSignalChannel; +import io.debezium.pipeline.signal.channels.KafkaSignalChannel; +import io.debezium.pipeline.signal.channels.SourceSignalChannel; +import io.debezium.pipeline.signal.channels.jmx.JmxSignalChannel; +import io.debezium.pipeline.signal.channels.process.InProcessSignalChannel; +import io.debezium.pipeline.txmetadata.DefaultTransactionMetadataFactory; +import io.debezium.schema.SchemaTopicNamingStrategy; +import io.debezium.snapshot.lock.NoLockingSupport; +import io.debezium.snapshot.mode.AlwaysSnapshotter; +import io.debezium.snapshot.mode.ConfigurationBasedSnapshotter; +import io.debezium.snapshot.mode.InitialOnlySnapshotter; +import io.debezium.snapshot.mode.InitialSnapshotter; +import io.debezium.snapshot.mode.NeverSnapshotter; +import io.debezium.snapshot.mode.NoDataSnapshotter; +import io.debezium.snapshot.mode.RecoverySnapshotter; +import io.debezium.snapshot.mode.SchemaOnlyRecoverySnapshotter; +import io.debezium.snapshot.mode.SchemaOnlySnapshotter; +import io.debezium.snapshot.mode.WhenNeededSnapshotter; +import io.debezium.snapshot.spi.SnapshotLock; +import io.debezium.storage.file.history.FileSchemaHistory; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; @@ -24,45 +51,105 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator; +import org.apache.kafka.connect.json.JsonConverter; +import org.apache.kafka.connect.source.SourceTask; +import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; public class DebeziumSupportProcessor { @BuildStep - ReflectiveClassBuildItem registerForReflection(CombinedIndexBuildItem combinedIndex) { + void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { + indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "connect-json")); + indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-api")); + } + + @BuildStep + RuntimeInitializedClassBuildItem runtimeInitializedClasses() { + return new RuntimeInitializedClassBuildItem(SaslClientAuthenticator.class.getName()); + } + + @BuildStep + void reflectiveClasses(CombinedIndexBuildItem combinedIndex, BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { IndexView index = combinedIndex.getIndex(); String[] dtos = index.getKnownClasses().stream().map(ci -> ci.name().toString()) .filter(n -> n.startsWith("org.apache.kafka.connect.json") || n.startsWith("io.debezium.engine.spi")) - .sorted() .toArray(String[]::new); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(dtos).fields().build()); - return ReflectiveClassBuildItem.builder(dtos).fields().build(); - } + dtos = index.getAllKnownImplementations(DotName.createSimple(SnapshotLock.class.getName())).stream() + .map(ci -> ci.name().toString()) + .toArray(String[]::new); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(dtos).fields().build()); - @BuildStep - ReflectiveClassBuildItem reflectiveClasses() { - return ReflectiveClassBuildItem.builder(new String[] { "org.apache.kafka.connect.storage.FileOffsetBackingStore", + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + "org.apache.kafka.connect.storage.FileOffsetBackingStore", "org.apache.kafka.connect.storage.MemoryOffsetBackingStore", + "io.debezium.storage.kafka.history.KafkaSchemaHistory", "io.debezium.relational.history.FileDatabaseHistory", - "io.debezium.embedded.ConvertingEngineBuilderFactory" }).build(); - } + "io.debezium.embedded.ConvertingEngineBuilderFactory", + "io.debezium.processors.PostProcessorRegistry", + "io.debezium.pipeline.txmetadata.DefaultTransactionMetadataFactory", + "io.debezium.schema.SchemaTopicNamingStrategy", + "io.debezium.storage.file.history.FileSchemaHistory") + .build()); - @BuildStep - void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { - indexDependency.produce(new IndexDependencyBuildItem("org.apache.kafka", "connect-json")); - indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-api")); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + DebeziumEngine.BuilderFactory.class, + ConvertingAsyncEngineBuilderFactory.class, + SaslClientAuthenticator.class, + JsonConverter.class, + DefaultTransactionMetadataFactory.class, + SchemaTopicNamingStrategy.class, + BaseSourceTask.class, + SinkNotificationChannel.class, + LogNotificationChannel.class, + JmxNotificationChannel.class, + SnapshotLock.class, + NoLockingSupport.class, + AlwaysSnapshotter.class, + InitialSnapshotter.class, + InitialOnlySnapshotter.class, + NoDataSnapshotter.class, + RecoverySnapshotter.class, + WhenNeededSnapshotter.class, + NeverSnapshotter.class, + SchemaOnlySnapshotter.class, + SchemaOnlyRecoverySnapshotter.class, + ConfigurationBasedSnapshotter.class, + SourceSignalChannel.class, + KafkaSignalChannel.class, + FileSignalChannel.class, + JmxSignalChannel.class, + InProcessSignalChannel.class, + StandardActionProvider.class, + SourceTask.class, + ConvertingAsyncEngineBuilderFactory.class, + DefaultTransactionMetadataFactory.class, + SchemaTopicNamingStrategy.class, + FileSchemaHistory.class) + .build()); } @BuildStep - void registerServiceProviders(BuildProducer<NativeImageResourceBuildItem> nativeImage) { - nativeImage.produce( + void registerNativeImageResources(BuildProducer<NativeImageResourceBuildItem> resources) { + resources.produce(new NativeImageResourceBuildItem( + "META-INF/services/io.debezium.embedded.async.ConvertingAsyncEngineBuilderFactory")); + resources.produce( new NativeImageResourceBuildItem("META-INF/services/io.debezium.engine.DebeziumEngine$BuilderFactory")); - } + resources.produce(new NativeImageResourceBuildItem("META-INF/services/io.debezium.spi.snapshot.Snapshotter")); + resources.produce( + new NativeImageResourceBuildItem("META-INF/services/io.debezium.pipeline.signal.channels.SignalChannelReader")); + resources.produce(new NativeImageResourceBuildItem( + "META-INF/services/io.debezium.pipeline.notification.channels.NotificationChannel")); + resources.produce(new NativeImageResourceBuildItem("META-INF/services/io.debezium.processors.PostProcessorProducer")); - @BuildStep - RuntimeInitializedClassBuildItem runtimeInitializedClasses() { - return new RuntimeInitializedClassBuildItem(SaslClientAuthenticator.class.getName()); + resources.produce(new NativeImageResourceBuildItem("META-INF/services/io.debezium.snapshot.spi.SnapshotLock")); + resources.produce(new NativeImageResourceBuildItem("META-INF/services/io.debezium.snapshot.spi.SnapshotQuery")); + resources + .produce(new NativeImageResourceBuildItem("META-INF/services/org.apache.kafka.connect.source.SourceConnector")); } + } diff --git a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java b/extensions-support/debezium/runtime/src/main/java/org/apache/camel/quarkus/support/debezium/graal/MBeansSubstitutions.java similarity index 63% copy from integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java copy to extensions-support/debezium/runtime/src/main/java/org/apache/camel/quarkus/support/debezium/graal/MBeansSubstitutions.java index c4daf9bbf7..4cb33b1092 100644 --- a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java +++ b/extensions-support/debezium/runtime/src/main/java/org/apache/camel/quarkus/support/debezium/graal/MBeansSubstitutions.java @@ -14,13 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.debezium.common.it.mongodb; +package org.apache.camel.quarkus.support.debezium.graal; -import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import io.debezium.metrics.Metrics; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638";) -@QuarkusIntegrationTest -class DebeziumMongodbIT extends DebeziumMongodbTest { +class MBeansSubstitutions { +} + +@TargetClass(value = Metrics.class) +final class MetricsConfigSubstitutions { + @Substitute + public synchronized void register() { + //do nothing + } + @Substitute + public synchronized void unregister() { + //do nothing + } } diff --git a/extensions/debezium-mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mongodb/deployment/DebeziumMongodbProcessor.java b/extensions/debezium-mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mongodb/deployment/DebeziumMongodbProcessor.java index 16bb75387a..ca9b9fac08 100644 --- a/extensions/debezium-mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mongodb/deployment/DebeziumMongodbProcessor.java +++ b/extensions/debezium-mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mongodb/deployment/DebeziumMongodbProcessor.java @@ -18,8 +18,13 @@ package org.apache.camel.quarkus.component.debezium.mongodb.deployment; import io.debezium.connector.mongodb.MongoDbConnector; import io.debezium.connector.mongodb.MongoDbConnectorTask; +import io.debezium.connector.mongodb.MongoDbSourceInfoStructMaker; +import io.debezium.connector.mongodb.connection.DefaultMongoDbAuthProvider; +import io.debezium.connector.mongodb.snapshot.query.SelectAllSnapshotQuery; +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; class DebeziumMongodbProcessor { @@ -32,8 +37,18 @@ class DebeziumMongodbProcessor { } @BuildStep - ReflectiveClassBuildItem reflectiveClasses() { - return ReflectiveClassBuildItem.builder(new String[] { MongoDbConnector.class.getName(), - MongoDbConnectorTask.class.getName() }).build(); + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + MongoDbConnector.class, + MongoDbConnectorTask.class, + MongoDbSourceInfoStructMaker.class, + DefaultMongoDbAuthProvider.class, + SelectAllSnapshotQuery.class).build()); + } + + @BuildStep + void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { + indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-connector-mongodb")); } } diff --git a/extensions/debezium-mysql/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mysql/deployment/DebeziumMysqlProcessor.java b/extensions/debezium-mysql/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mysql/deployment/DebeziumMysqlProcessor.java index ab7af1dd8d..40c6e67136 100644 --- a/extensions/debezium-mysql/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mysql/deployment/DebeziumMysqlProcessor.java +++ b/extensions/debezium-mysql/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/mysql/deployment/DebeziumMysqlProcessor.java @@ -16,6 +16,10 @@ */ package org.apache.camel.quarkus.component.debezium.mysql.deployment; +import io.debezium.connector.mysql.MySqlConnector; +import io.debezium.connector.mysql.MySqlConnectorTask; +import io.debezium.connector.mysql.MySqlSourceInfoStructMaker; +import io.debezium.connector.mysql.snapshot.query.SelectAllSnapshotQuery; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; @@ -32,13 +36,18 @@ class DebeziumMysqlProcessor { } @BuildStep - ReflectiveClassBuildItem reflectiveClasses() { - return ReflectiveClassBuildItem.builder(new String[] { "io.debezium.connector.mysql.MySqlConnector", - "io.debezium.connector.mysql.MySqlConnectorTask" }).build(); + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + MySqlConnector.class, + MySqlConnectorTask.class, + MySqlSourceInfoStructMaker.class, + SelectAllSnapshotQuery.class).build()); } @BuildStep void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-connector-mysql")); + indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-connector-binlog")); } } diff --git a/extensions/debezium-oracle/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/oracle/deployment/DebeziumOracleProcessor.java b/extensions/debezium-oracle/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/oracle/deployment/DebeziumOracleProcessor.java index 927ab8a85f..14cad95cd2 100644 --- a/extensions/debezium-oracle/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/oracle/deployment/DebeziumOracleProcessor.java +++ b/extensions/debezium-oracle/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/oracle/deployment/DebeziumOracleProcessor.java @@ -17,8 +17,15 @@ package org.apache.camel.quarkus.component.debezium.oracle.deployment; import io.debezium.connector.oracle.OracleConnector; +import io.debezium.connector.oracle.OracleConnectorTask; +import io.debezium.connector.oracle.OracleSourceInfoStructMaker; +import io.debezium.connector.oracle.logminer.buffered.BufferedLogMinerAdapter; +import io.debezium.connector.oracle.snapshot.query.SelectAllSnapshotQuery; +import io.debezium.storage.kafka.history.KafkaSchemaHistory; +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; class DebeziumOracleProcessor { @@ -31,9 +38,19 @@ class DebeziumOracleProcessor { } @BuildStep - ReflectiveClassBuildItem registerForReflection() { - return ReflectiveClassBuildItem.builder(OracleConnector.class.getName()) - .build(); + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + OracleConnector.class, + OracleConnectorTask.class, + OracleSourceInfoStructMaker.class, + SelectAllSnapshotQuery.class, + BufferedLogMinerAdapter.class, + KafkaSchemaHistory.class).build()); } + @BuildStep + void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { + indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-connector-oracle")); + } } diff --git a/extensions/debezium-postgres/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/postgres/deployment/DebeziumPostgresProcessor.java b/extensions/debezium-postgres/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/postgres/deployment/DebeziumPostgresProcessor.java index ff6a23c837..f3cc14bab7 100644 --- a/extensions/debezium-postgres/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/postgres/deployment/DebeziumPostgresProcessor.java +++ b/extensions/debezium-postgres/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/postgres/deployment/DebeziumPostgresProcessor.java @@ -32,12 +32,16 @@ class DebeziumPostgresProcessor { } @BuildStep - ReflectiveClassBuildItem reflectiveClasses() { - return ReflectiveClassBuildItem.builder(new String[] { "io.debezium.connector.postgresql.PostgresConnector", + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + "io.debezium.connector.postgresql.PostgresConnector", "io.debezium.connector.postgresql.PostgresConnectorTask", "io.debezium.connector.postgresql.PostgresSourceInfoStructMaker", - "io.debezium.pipeline.txmetadata.DefaultTransactionMetadataFactory", - "io.debezium.schema.SchemaTopicNamingStrategy" }).build(); + "io.debezium.connector.postgresql.snapshot.lock.NoSnapshotLock", + "io.debezium.connector.postgresql.snapshot.lock.SharedSnapshotLock", + "io.debezium.connector.postgresql.snapshot.query.SelectAllSnapshotQuery") + .build()); } @BuildStep diff --git a/extensions/debezium-sqlserver/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/sqlserver/deployment/DebeziumSqlserverProcessor.java b/extensions/debezium-sqlserver/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/sqlserver/deployment/DebeziumSqlserverProcessor.java index a80e4b0af8..f06a9c269d 100644 --- a/extensions/debezium-sqlserver/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/sqlserver/deployment/DebeziumSqlserverProcessor.java +++ b/extensions/debezium-sqlserver/deployment/src/main/java/org/apache/camel/quarkus/component/debezium/sqlserver/deployment/DebeziumSqlserverProcessor.java @@ -37,6 +37,19 @@ class DebeziumSqlserverProcessor { "io.debezium.connector.sqlserver.SqlServerConnectorTask" }).build(); } + @BuildStep + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + + reflectiveClasses.produce(ReflectiveClassBuildItem.builder( + "io.debezium.connector.sqlserver.SqlServerConnector", + "io.debezium.connector.sqlserver.SqlServerConnectorTask", + "io.debezium.connector.sqlserver.SqlServerSourceInfoStructMaker", + "io.debezium.connector.sqlserver.snapshot.lock.NoSnapshotLock", + "io.debezium.connector.sqlserver.snapshot.lock.ExclusiveSnapshotLock", + "io.debezium.connector.sqlserver.snapshot.query.SelectAllSnapshotQuery") + .methods().fields().build()); + } + @BuildStep void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { indexDependency.produce(new IndexDependencyBuildItem("io.debezium", "debezium-connector-sqlserver")); diff --git a/integration-test-groups/debezium/mongodb/pom.xml b/integration-test-groups/debezium/mongodb/pom.xml index 94e9ff182e..5eef94a257 100644 --- a/integration-test-groups/debezium/mongodb/pom.xml +++ b/integration-test-groups/debezium/mongodb/pom.xml @@ -96,7 +96,6 @@ </dependencies> <profiles> - <!-- https://github.com/apache/camel-quarkus/issues/4638 <profile> <id>native</id> <activation> @@ -124,7 +123,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java b/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java index c4daf9bbf7..a89dc342af 100644 --- a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java +++ b/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.mongodb; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638";) @QuarkusIntegrationTest class DebeziumMongodbIT extends DebeziumMongodbTest { diff --git a/integration-test-groups/debezium/mssql/pom.xml b/integration-test-groups/debezium/mssql/pom.xml index a0f970c552..43e5fb6815 100644 --- a/integration-test-groups/debezium/mssql/pom.xml +++ b/integration-test-groups/debezium/mssql/pom.xml @@ -50,8 +50,8 @@ </dependency> <!-- Required since it's excluded from the runtime classpath by default --> <dependency> - <groupId>com.mysql</groupId> - <artifactId>mysql-connector-j</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-jdbc-mysql</artifactId> </dependency> <!-- test dependencies --> @@ -109,7 +109,6 @@ </build> <profiles> - <!-- https://github.com/apache/camel-quarkus/issues/4638 <profile> <id>native</id> <activation> @@ -137,7 +136,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverIT.java b/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverIT.java index 6472f13f7c..a15094abd3 100644 --- a/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverIT.java +++ b/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.sqlserv; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638";) @QuarkusIntegrationTest class DebeziumSqlserverIT extends DebeziumSqlserverTest { diff --git a/integration-test-groups/debezium/mysql/pom.xml b/integration-test-groups/debezium/mysql/pom.xml index e52511d959..ce179a229f 100644 --- a/integration-test-groups/debezium/mysql/pom.xml +++ b/integration-test-groups/debezium/mysql/pom.xml @@ -101,7 +101,6 @@ </dependencies> <profiles> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/6357 <profile> <id>native</id> <activation> @@ -129,7 +128,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlIT.java b/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlIT.java index 5522d7a162..9a24729310 100644 --- a/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlIT.java +++ b/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.mysql; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638";) @QuarkusIntegrationTest class DebeziumMysqlIT extends DebeziumMysqlTest { diff --git a/integration-test-groups/debezium/oracle/pom.xml b/integration-test-groups/debezium/oracle/pom.xml index b412442063..c62c3378cd 100644 --- a/integration-test-groups/debezium/oracle/pom.xml +++ b/integration-test-groups/debezium/oracle/pom.xml @@ -108,7 +108,6 @@ </dependencies> <profiles> - <!-- https://github.com/apache/camel-quarkus/issues/4638, https://github.com/apache/camel-quarkus/issues/7396 <profile> <id>native</id> <activation> @@ -136,7 +135,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleIT.java b/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleIT.java index 81d15bf4e4..c739c19900 100644 --- a/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleIT.java +++ b/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleIT.java @@ -19,7 +19,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.postgres; import io.quarkus.test.junit.QuarkusIntegrationTest; import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638, https://github.com/apache/camel-quarkus/issues/7396";) +@Disabled //todo @QuarkusIntegrationTest class DebeziumOracleIT extends DebeziumOracleTest { } diff --git a/integration-test-groups/debezium/postgresql/pom.xml b/integration-test-groups/debezium/postgresql/pom.xml index b2e12d78a4..d6405de0ed 100644 --- a/integration-test-groups/debezium/postgresql/pom.xml +++ b/integration-test-groups/debezium/postgresql/pom.xml @@ -102,7 +102,6 @@ </dependencies> <profiles> - <!-- https://github.com/apache/camel-quarkus/issues/4638 <profile> <id>native</id> <activation> @@ -130,7 +129,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresIT.java b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresIT.java index f8c9b6980f..dd14b0d878 100644 --- a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresIT.java +++ b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.debezium.common.it.postgres; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4638";) @QuarkusIntegrationTest class DebeziumPostgresIT extends DebeziumPostgresTest { diff --git a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java index 5514dcfd38..0e4d5cdce9 100644 --- a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java +++ b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java @@ -29,7 +29,6 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -54,13 +53,11 @@ class DebeziumPostgresTest extends AbstractDebeziumTest { connection = DriverManager.getConnection(jdbcUrl); } - @Disabled("https://github.com/apache/camel-quarkus/issues/6911";) @Test @Override public void testUpdate() throws SQLException { } - @Disabled("https://github.com/apache/camel-quarkus/issues/6911";) @Test @Override public void testDelete() throws SQLException { diff --git a/integration-tests/debezium-grouped/pom.xml b/integration-tests/debezium-grouped/pom.xml index 1f73605f78..4e97298a5b 100644 --- a/integration-tests/debezium-grouped/pom.xml +++ b/integration-tests/debezium-grouped/pom.xml @@ -203,7 +203,6 @@ </build> <profiles> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/7396 <profile> <id>native</id> <activation> @@ -231,7 +230,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation>
