From c7d5004dec7caf57a3444d05f4988954eb387375 Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@gmail.com>
Date: Fri, 12 May 2023 11:52:34 +0000
Subject: [PATCH] upgrade to spring boot 3.1.0-RC2

---
 .gitpod.yml                                   |  1 +
 .vscode/launch.json                           |  7 ++-
 .../pom.xml                                   | 45 ++++++++++++-------
 ...aDeadLetterPublishingApplicationTests.java | 12 ++---
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index d9ca7352..43c09950 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -29,5 +29,6 @@ ports:
     visibility: public
   - port: 9000
     visibility: public
+    onOpen: open-browser
   - port: 29092
     visibility: public
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1b349637..70ec3f34 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,10 +2,13 @@
     "configurations": [
         {
             "type": "java",
-            "name": "KafkaDeadLetterPublishingApplication",
+            "name": "Spring Boot-KafkaDeadLetterPublishingApplication<kafka-dead-letter-publishing>",
             "request": "launch",
+            "cwd": "${workspaceFolder}",
             "mainClass": "com.github.timtebeek.KafkaDeadLetterPublishingApplication",
-            "projectName": "kafka-dead-letter-publishing"
+            "projectName": "kafka-dead-letter-publishing",
+            "args": "",
+            "envFile": "${workspaceFolder}/.env"
         },
         {
             "type": "java",
diff --git a/kafka-dead-letter-publishing-spring-boot/pom.xml b/kafka-dead-letter-publishing-spring-boot/pom.xml
index 3e829967..4d518944 100644
--- a/kafka-dead-letter-publishing-spring-boot/pom.xml
+++ b/kafka-dead-letter-publishing-spring-boot/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.6</version>
+        <version>3.1.0-RC2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -44,6 +44,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka-test</artifactId>
@@ -60,17 +65,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>${testcontainers.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 
     <build>
         <plugins>
@@ -85,7 +79,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.16.0</version>
+                            <version>1.17.0</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>
@@ -102,4 +96,25 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>
\ No newline at end of file
diff --git a/kafka-dead-letter-publishing-spring-boot/src/test/java/com/github/timtebeek/KafkaDeadLetterPublishingApplicationTests.java b/kafka-dead-letter-publishing-spring-boot/src/test/java/com/github/timtebeek/KafkaDeadLetterPublishingApplicationTests.java
index 84280f1c..6fdeb586 100644
--- a/kafka-dead-letter-publishing-spring-boot/src/test/java/com/github/timtebeek/KafkaDeadLetterPublishingApplicationTests.java
+++ b/kafka-dead-letter-publishing-spring-boot/src/test/java/com/github/timtebeek/KafkaDeadLetterPublishingApplicationTests.java
@@ -16,10 +16,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.kafka.core.KafkaOperations;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -35,14 +34,9 @@ class KafkaDeadLetterPublishingApplicationTests {
     private static final String ORDERS_DLT = "orders.DLT";
 
     @Container // https://www.testcontainers.org/modules/kafka/
+    @ServiceConnection
     static KafkaContainer kafka =
-            new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.3")).withKraft();
-
-    @DynamicPropertySource
-    static void setProperties(DynamicPropertyRegistry registry) {
-        // Connect our Spring application to our Testcontainers Kafka instance
-        registry.add("spring.kafka.bootstrap-servers", kafka::getBootstrapServers);
-    }
+            new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.4.0")).withKraft();
 
     @Autowired private KafkaOperations<String, Order> operations;