This is an automated email from the ASF dual-hosted git repository. oscerd pushed a commit to branch upgrade-kafka-4.2.1 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 1d27ea77a0719541cc13d84ecbe8d491a65a3343 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Jun 11 10:37:35 2026 +0200 Upgrade to Apache Kafka 4.2.1 Upgrade the project from Kafka 3.9.2 to 4.2.1 to adopt the Kafka 4.x line which removes ZooKeeper, drops Scala 2.12, and requires Java 17 for Connect/brokers. Changes: - Bump kafka.version from 3.9.2 to 4.2.1 - Migrate from kafka_2.12 to kafka_2.13 (Scala 2.12 removed in Kafka 4.0) - Update scala-library from 2.12.12 to 2.13.17 - Add connect-json to dependencyManagement to align the version pulled transitively by apicurio-registry-utils-converter (was 3.6.1, now 4.2.1) - Update Strimzi test container images to 0.51.0-kafka-4.2.0 - Remove ZooKeeper logger from test log4j2.properties - Remove stale connector module entries (github, jms-amqp-10-ssl) that reference non-existent directories Fixes: #1778 Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> --- connectors/pom.xml | 8 +------- parent/pom.xml | 17 +++++++++++------ .../itests-common/src/test/resources/log4j2.properties | 5 ----- tests/itests-parent/pom.xml | 4 ++-- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/connectors/pom.xml b/connectors/pom.xml index 898481a8f3..f6c4d2bdea 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -257,11 +257,7 @@ <module>camel-ftp-source-kafka-connector</module> <module>camel-ftps-sink-kafka-connector</module> <module>camel-ftps-source-kafka-connector</module> - <module>camel-github-commit-source-kafka-connector</module> - <module>camel-github-event-source-kafka-connector</module> - <module>camel-github-pullrequest-comment-source-kafka-connector</module> - <module>camel-github-pullrequest-source-kafka-connector</module> - <module>camel-github-tag-source-kafka-connector</module> + <module>camel-google-bigquery-sink-kafka-connector</module> <module>camel-google-calendar-source-kafka-connector</module> <module>camel-google-functions-sink-kafka-connector</module> @@ -288,8 +284,6 @@ <module>camel-jdbc-kafka-connector</module> <module>camel-jms-amqp-10-sink-kafka-connector</module> <module>camel-jms-amqp-10-source-kafka-connector</module> - <module>camel-jms-amqp-10-ssl-sink-kafka-connector</module> - <module>camel-jms-amqp-10-ssl-source-kafka-connector</module> <module>camel-jms-apache-artemis-sink-kafka-connector</module> <module>camel-jms-apache-artemis-source-kafka-connector</module> <module>camel-jms-ibm-mq-sink-kafka-connector</module> diff --git a/parent/pom.xml b/parent/pom.xml index f23fe9c348..ac4fa8b4cf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -27,7 +27,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <kafka.version>3.9.2</kafka.version> + <kafka.version>4.2.1</kafka.version> <camel.version>4.21.0-SNAPSHOT</camel.version> <camel.kamelet.catalog.version>4.21.0-SNAPSHOT</camel.kamelet.catalog.version> <apicurio.registry.version>2.5.11.Final</apicurio.registry.version> @@ -52,7 +52,7 @@ <version.maven.jar>3.1.0</version.maven.jar> <version.maven.failsafe>3.5.5</version.maven.failsafe> <version.maven.surefire>3.5.5</version.maven.surefire> - <version.scala.library>2.12.12</version.scala.library> + <version.scala.library>2.13.17</version.scala.library> <version.maven.maven-remote-resources-plugin>1.6.0</version.maven.maven-remote-resources-plugin> <version.maven.checkstyle>8.29</version.maven.checkstyle> @@ -63,8 +63,8 @@ <mycila-license-version>3.0</mycila-license-version> <groovy-version>3.0.21</groovy-version> - <itest.zookeeper.container.image>quay.io/strimzi/kafka:0.32.0-kafka-3.2.1</itest.zookeeper.container.image> - <itest.strimzi.container.image>quay.io/strimzi/kafka:0.32.0-kafka-3.2.1</itest.strimzi.container.image> + <itest.zookeeper.container.image>quay.io/strimzi/kafka:0.51.0-kafka-4.2.0</itest.zookeeper.container.image> + <itest.strimzi.container.image>quay.io/strimzi/kafka:0.51.0-kafka-4.2.0</itest.strimzi.container.image> <checkstyle.failOnViolation>false</checkstyle.failOnViolation> </properties> @@ -140,7 +140,7 @@ </dependency> <dependency> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.12</artifactId> + <artifactId>kafka_2.13</artifactId> <version>${kafka.version}</version> <classifier>test</classifier> <type>test-jar</type> @@ -154,7 +154,12 @@ </dependency> <dependency> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.12</artifactId> + <artifactId>connect-json</artifactId> + <version>${kafka.version}</version> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka_2.13</artifactId> <version>${kafka.version}</version> <scope>test</scope> </dependency> diff --git a/tests/itests-common/src/test/resources/log4j2.properties b/tests/itests-common/src/test/resources/log4j2.properties index dbd3f9e9df..5d658cdd9e 100644 --- a/tests/itests-common/src/test/resources/log4j2.properties +++ b/tests/itests-common/src/test/resources/log4j2.properties @@ -45,11 +45,6 @@ logger.camel-components.additivity = false logger.camel-components.appenderRef.file.ref = file # Useful for the embedded Kafka/Kafka Connect runtime -logger.zookeeper.name = org.apache.zookeeper -logger.zookeeper.level = WARN -logger.zookeeper.additivity = false -logger.zookeeper.appenderRef.file.ref = file - logger.kafka.name = org.apache.kafka logger.kafka.level = WARN logger.kafka.additivity = false diff --git a/tests/itests-parent/pom.xml b/tests/itests-parent/pom.xml index 88bf5da78d..afac12db99 100644 --- a/tests/itests-parent/pom.xml +++ b/tests/itests-parent/pom.xml @@ -133,12 +133,12 @@ </dependency> <dependency> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.12</artifactId> + <artifactId>kafka_2.13</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.12</artifactId> + <artifactId>kafka_2.13</artifactId> <classifier>test</classifier> <type>test-jar</type> <scope>test</scope>
