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/03/09 08:26:24 UTC

[camel] branch CAMEL-19019/upgrade-kafka-3.4 created (now 5bb9ff3a0f1)

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a change to branch CAMEL-19019/upgrade-kafka-3.4
in repository https://gitbox.apache.org/repos/asf/camel.git


      at 5bb9ff3a0f1 CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x

This branch includes the following new commits:

     new 5bb9ff3a0f1 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
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5bb9ff3a0f1cfa4ef54811f0b8a9a6bbceb10cb2
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Thu Mar 9 08:50:04 2023 +0100

    CAMEL-19019: camel-kafka - Upgrade to Kafka 3.4.x
---
 camel-dependencies/pom.xml                                           | 5 ++---
 parent/pom.xml                                                       | 5 ++---
 .../camel/test/infra/kafka/services/ContainerLocalKafkaService.java  | 4 ++--
 .../infra/kafka/services/RedpandaTransactionsEnabledContainer.java   | 2 +-
 .../org/apache/camel/test/infra/kafka/services/StrimziContainer.java | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index e5cfd487ff5..213d825a645 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -318,9 +318,8 @@
         <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.2.3</kafka-version>
-	<kafka-debezium-version>3.3.1</kafka-debezium-version>
-        <kafka-vertx-version>2.8.2</kafka-vertx-version>
+        <kafka-version>3.4.0</kafka-version>
+        <kafka-debezium-version>3.4.0</kafka-debezium-version>
         <kotlin-version>1.8.0</kotlin-version>
         <kubernetes-client-version>6.4.1</kubernetes-client-version>
         <kubernetes-model-version>6.4.1</kubernetes-model-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index a2a05984a01..5248a785fa0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -313,9 +313,8 @@
         <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.2.3</kafka-version>
-	<kafka-debezium-version>3.3.1</kafka-debezium-version>
-        <kafka-vertx-version>2.8.2</kafka-vertx-version>
+        <kafka-version>3.4.0</kafka-version>
+        <kafka-debezium-version>3.4.0</kafka-debezium-version>
         <kotlin-version>1.8.0</kotlin-version>
         <kubernetes-client-version>6.4.1</kubernetes-client-version>
         <kubernetes-model-version>6.4.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 a13e0697d4e..56047ce8ec8 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
@@ -25,7 +25,7 @@ import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class ContainerLocalKafkaService implements KafkaService, ContainerService<KafkaContainer> {
-    public static final String KAFKA3_IMAGE_NAME = "confluentinc/cp-kafka:7.3.1";
+    public static final String KAFKA3_IMAGE_NAME = "confluentinc/cp-kafka:7.3.2";
 
     private static final Logger LOG = LoggerFactory.getLogger(ContainerLocalKafkaService.class);
     private final KafkaContainer kafka;
@@ -39,7 +39,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;