This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 289bdd08efe9b5c1f282c95bca577a00324ae8f9 Author: Andrea Tarocchi <andrea.taroc...@gmail.com> AuthorDate: Tue May 28 13:56:24 2024 +0200 Dependencies fix after Upgrade to Kafka 3.6.1 used by Camel 4.4.x --- core/pom.xml | 11 +++++++++++ parent/pom.xml | 2 +- .../common/services/kafka/EmbeddedKafkaService.java | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index a48e81574a..6b76f3d8b8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -101,6 +101,17 @@ <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-avro</artifactId> <version>${jackson2-version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.11.3</version> </dependency> <!-- Test --> diff --git a/parent/pom.xml b/parent/pom.xml index df7f1a3ae7..9394e6472b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -30,7 +30,7 @@ <kafka.version>3.6.1</kafka.version> <camel.version>4.4.2</camel.version> <camel.kamelet.catalog.version>4.4.2</camel.kamelet.catalog.version> - <apicurio.registry.version>1.3.2.Final</apicurio.registry.version> + <apicurio.registry.version>2.5.11.Final</apicurio.registry.version> <resteasy.version>4.5.6.Final</resteasy.version> <version.java>17</version.java> <version.guava>20.0</version.guava> diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java index 63b6892fed..7ab09c0cbf 100644 --- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java +++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java @@ -26,6 +26,7 @@ import org.apache.camel.kafkaconnector.common.PluginPathHelper; import org.apache.camel.kafkaconnector.common.utils.NetworkUtils; import org.apache.camel.test.infra.kafka.services.KafkaService; import org.apache.kafka.connect.runtime.WorkerConfig; +import org.apache.kafka.connect.runtime.isolation.PluginDiscoveryMode; import org.apache.kafka.connect.runtime.rest.RestServerConfig; import org.apache.kafka.connect.util.clusters.EmbeddedConnectCluster; import org.junit.jupiter.api.extension.ExtensionContext; @@ -56,6 +57,8 @@ public class EmbeddedKafkaService implements KafkaService { String address = "http://localhost:" + NetworkUtils.getFreePort(); LOG.info("Using the following address for the listener configuration: {}", address); workerProps.put(RestServerConfig.LISTENERS_CONFIG, address); + LOG.info("Setting {} to: {}", WorkerConfig.PLUGIN_DISCOVERY_CONFIG, PluginDiscoveryMode.HYBRID_WARN); + workerProps.put(WorkerConfig.PLUGIN_DISCOVERY_CONFIG, String.valueOf(PluginDiscoveryMode.HYBRID_WARN)); String pluginPaths = PluginPathHelper.getInstance().pluginPaths();