Skip to content

Commit 87012a5

Browse files
feat : using apachekafka container for tests
1 parent 13f240e commit 87012a5

File tree

8 files changed

+14
-18
lines changed

8 files changed

+14
-18
lines changed

kafka-spring-cloud-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.2</version>
8+
<version>3.4.0-M1</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.example</groupId>

kafka-spring-cloud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.test.context.DynamicPropertyRegistry;
9-
import org.testcontainers.containers.KafkaContainer;
9+
import org.testcontainers.kafka.KafkaContainer;
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
@TestConfiguration(proxyBeanMethods = false)
@@ -15,9 +15,7 @@ class TestCloudKafkaSampleApplication {
1515
@Bean
1616
@ServiceConnection
1717
KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
18-
KafkaContainer kafkaContainer = new KafkaContainer(
19-
DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"))
20-
.withKraft()
18+
KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1"))
2119
.withReuse(true);
2220
dynamicPropertyRegistry.add("spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers);
2321
return kafkaContainer;

kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.2</version>
8+
<version>3.4.0-M1</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.example</groupId>

kafka-streams/analytics-spring-cloud-streams-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.test.context.DynamicPropertyRegistry;
9-
import org.testcontainers.containers.KafkaContainer;
9+
import org.testcontainers.kafka.KafkaContainer;
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
@TestConfiguration(proxyBeanMethods = false)
1313
public class TestAnalyticsConsumerApplication {
1414

1515
private static final DockerImageName KAFKA_IMAGE_NAME =
16-
DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2");
16+
DockerImageName.parse("apache/kafka").withTag("3.7.1");
1717

1818
@Bean
1919
@ServiceConnection
2020
KafkaContainer kafkaContainer(DynamicPropertyRegistry registry) {
21-
KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME).withKraft();
21+
KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME);
2222
registry.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers);
2323
return kafkaContainer;
2424
}

kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.3.2</version>
9+
<version>3.4.0-M1</version>
1010
<relativePath /> <!-- lookup parent from repository -->
1111
</parent>
1212

kafka-streams/analytics-spring-cloud-streams-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.test.context.DynamicPropertyRegistry;
9-
import org.testcontainers.containers.KafkaContainer;
9+
import org.testcontainers.kafka.KafkaContainer;
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
@TestConfiguration(proxyBeanMethods = false)
@@ -16,8 +16,7 @@ class TestAnalyticsProducerApplication {
1616
@ServiceConnection
1717
KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) {
1818
KafkaContainer kafkaContainer =
19-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"))
20-
.withKraft();
19+
new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1"));
2120
propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
2221
return kafkaContainer;
2322
}

spring-modulith-outbox-pattern/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>3.3.2</version>
10+
<version>3.4.0-M1</version>
1111
<relativePath/> <!-- lookup parent from repository -->
1212
</parent>
1313
<groupId>com.example.outboxpattern</groupId>

spring-modulith-outbox-pattern/src/test/java/com/example/outboxpattern/common/ContainersConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.test.context.DynamicPropertyRegistry;
77
import org.testcontainers.containers.GenericContainer;
8-
import org.testcontainers.containers.KafkaContainer;
98
import org.testcontainers.containers.PostgreSQLContainer;
9+
import org.testcontainers.kafka.KafkaContainer;
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
@TestConfiguration(proxyBeanMethods = false)
@@ -21,9 +21,8 @@ PostgreSQLContainer<?> postgreSQLContainer() {
2121
@Bean
2222
@ServiceConnection
2323
KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
24-
KafkaContainer kafkaContainer = new KafkaContainer(
25-
DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"))
26-
.withKraft();
24+
KafkaContainer kafkaContainer =
25+
new KafkaContainer(DockerImageName.parse("apache/kafka").withTag("3.7.1"));
2726
// Connect our Spring application to our Testcontainers Kafka instance
2827
dynamicPropertyRegistry.add("spring.kafka.consumer.bootstrap-servers", kafkaContainer::getBootstrapServers);
2928
dynamicPropertyRegistry.add("spring.kafka.producer.bootstrap-servers", kafkaContainer::getBootstrapServers);

0 commit comments

Comments
 (0)