From 1ac6e9ebe155f09ad07e049dbe7324fcfa53bdc3 Mon Sep 17 00:00:00 2001 From: kitbolourchi Date: Tue, 16 May 2023 20:11:33 +0100 Subject: [PATCH] Upgrade Kafka image used in integration tests See gh-35625 --- ...afkaContainerConnectionDetailsFactoryIntegrationTests.java | 4 ---- .../boot/testsupport/testcontainers/DockerImageNames.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java index 04d995d852..713a140277 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,7 +22,6 @@ import java.util.List; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.OS; import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -31,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.junit.DisabledOnOs; import org.springframework.boot.testsupport.testcontainers.DockerImageNames; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -53,8 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat; @Testcontainers(disabledWithoutDocker = true) @TestPropertySource(properties = { "spring.kafka.consumer.group-id=test-group", "spring.kafka.consumer.auto-offset-reset=earliest" }) -@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", - disabledReason = "The Kafka image has no ARM support") class KafkaContainerConnectionDetailsFactoryIntegrationTests { @Container diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java index 46b65188c5..4ef13942d9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java @@ -36,7 +36,7 @@ public final class DockerImageNames { private static final String ELASTICSEARCH_VERSION = "7.17.5"; - private static final String KAFKA_VERSION = "5.4.3"; + private static final String KAFKA_VERSION = "7.4.0"; private static final String MONGO_VERSION = "5.0.17";