feat : upgrade to latest milestone

rajadilipkolli · Aug 23, 2024 · 8644f08 · 8644f08
1 parent db5e4ef
commit 8644f08
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml b/kafka-streams/analytics-spring-cloud-streams-kafka-consumer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
+		<version>3.4.0-M2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -15,8 +15,8 @@
 	<description>Demo project for Spring Boot and Kafka Consumer StreamCapabilities</description>
 
 	<properties>
-		<java.version>17</java.version>
-		<spring-cloud.version>2023.0.3</spring-cloud.version>
+		<java.version>21</java.version>
+		<spring-cloud.version>2024.0.0-M1</spring-cloud.version>
 		<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
 
 		<spotless.version>2.43.0</spotless.version>

diff --git a/...-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java b/...-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java
@@ -6,19 +6,19 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.DynamicPropertyRegistry;
-import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.kafka.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestAnalyticsConsumerApplication {
 
     private static final DockerImageName KAFKA_IMAGE_NAME =
-            DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2");
+            DockerImageName.parse("apache/kafka-native").withTag("3.8.0");
 
     @Bean
     @ServiceConnection
     KafkaContainer kafkaContainer(DynamicPropertyRegistry registry) {
-        KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME).withKraft();
+        KafkaContainer kafkaContainer = new KafkaContainer(KAFKA_IMAGE_NAME);
         registry.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers);
         return kafkaContainer;
     }

diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
+		<version>3.4.0-M2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -17,8 +17,8 @@
 	<description>Demo project for Spring Boot and Kafka Producer StreamCapabilities</description>
 
 	<properties>
-		<java.version>17</java.version>
-		<spring-cloud.version>2023.0.3</spring-cloud.version>
+		<java.version>21</java.version>
+		<spring-cloud.version>2024.0.0-M1</spring-cloud.version>
 
 		<spotless.version>2.43.0</spotless.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/...-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java b/...-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java
@@ -6,7 +6,7 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.DynamicPropertyRegistry;
-import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.kafka.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -16,8 +16,7 @@ class TestAnalyticsProducerApplication {
     @ServiceConnection
     KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) {
         KafkaContainer kafkaContainer =
-                new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.2"))
-                        .withKraft();
+                new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.0"));
         propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
         return kafkaContainer;
     }