You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/06/20 13:14:59 UTC
[camel] branch CAMEL-19019/upgrade-kafka-3.4-3.x created (now 409681b273f)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-19019/upgrade-kafka-3.4-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
at 409681b273f CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x
This branch includes the following new commits:
new 409681b273f CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19019/upgrade-kafka-3.4-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 409681b273f52c5d6617da4fe21034a15a713e06
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Thu Mar 9 10:25:21 2023 +0100
CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x
In order to get the latest improvements and bug fixes, we need to upgrade to Kafka 3.4.
* Change the version of Kafka to `3.4.0`
* Remove the version of Kafka vert.x as it is no more used
* Update the version of the Docker images used to the latest version
* Force the image name to the `KafkaContainer` to avoid using the default tag which `5.4.3`
---
camel-dependencies/pom.xml | 3 ++-
parent/pom.xml | 3 ++-
.../camel/test/infra/kafka/services/ContainerLocalKafkaService.java | 2 +-
.../infra/kafka/services/RedpandaTransactionsEnabledContainer.java | 2 +-
.../org/apache/camel/test/infra/kafka/services/StrimziContainer.java | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b83c3c85599..f32397d5f7d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -364,8 +364,9 @@
<jython-standalone-version>2.7.3</jython-standalone-version>
<jython-version>2.7.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>3.3.2</kafka-version>
+ <kafka-version>3.4.1</kafka-version>
<kafka-vertx-version>2.8.2</kafka-vertx-version>
+ <kafka-debezium-version>3.3.1</kafka-debezium-version>
<kotlin-version>1.7.22</kotlin-version>
<kubernetes-client-version>6.3.1</kubernetes-client-version>
<kubernetes-model-version>6.3.1</kubernetes-model-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d69fb1788d..857e9e16bda 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -347,8 +347,9 @@
<jython-version>2.7.3</jython-version>
<jython-standalone-version>2.7.3</jython-standalone-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>3.3.2</kafka-version>
+ <kafka-version>3.4.1</kafka-version>
<kafka-vertx-version>2.8.2</kafka-vertx-version>
+ <kafka-debezium-version>3.3.1</kafka-debezium-version>
<kotlin-version>1.7.22</kotlin-version>
<kubernetes-client-version>6.3.1</kubernetes-client-version>
<kubernetes-model-version>6.3.1</kubernetes-model-version>
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
index f12537305b9..8d0a531725f 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
@@ -40,7 +40,7 @@ public class ContainerLocalKafkaService implements KafkaService, ContainerServic
}
protected KafkaContainer initContainer() {
- return new KafkaContainer().withEmbeddedZookeeper();
+ return new KafkaContainer(DockerImageName.parse(KAFKA3_IMAGE_NAME)).withEmbeddedZookeeper();
}
public String getBootstrapServers() {
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/RedpandaTransactionsEnabledContainer.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/RedpandaTransactionsEnabledContainer.java
index 86e20185458..28aa3914020 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/RedpandaTransactionsEnabledContainer.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/RedpandaTransactionsEnabledContainer.java
@@ -22,7 +22,7 @@ import org.testcontainers.redpanda.RedpandaContainer;
public class RedpandaTransactionsEnabledContainer extends RedpandaContainer {
- public static final String DEFAULT_REDPANDA_CONTAINER = "docker.redpanda.com/vectorized/redpanda:v22.3.10";
+ public static final String DEFAULT_REDPANDA_CONTAINER = "docker.redpanda.com/vectorized/redpanda:v23.1.1";
public static final String REDPANDA_CONTAINER
= System.getProperty("itest.redpanda.container.image", DEFAULT_REDPANDA_CONTAINER);
public static final int REDPANDA_PORT = 9092;
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
index feaf38229bf..7287d664209 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
@@ -23,7 +23,7 @@ import org.testcontainers.containers.Network;
import org.testcontainers.containers.wait.strategy.Wait;
public class StrimziContainer extends GenericContainer<StrimziContainer> {
- public static final String DEFAULT_STRIMZI_CONTAINER = "quay.io/strimzi/kafka:latest-kafka-3.3.1";
+ public static final String DEFAULT_STRIMZI_CONTAINER = "quay.io/strimzi/kafka:latest-kafka-3.4.0";
private static final String STRIMZI_CONTAINER
= System.getProperty("itest.strimzi.container.image", DEFAULT_STRIMZI_CONTAINER);
private static final int KAFKA_PORT = 9092;