From a8b1bc2ac06ee78c37866a4e7381e468496788c4 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Wed, 10 Jul 2024 16:22:21 +0200
Subject: [PATCH] recorder: 1.0.1 - UPDATE 001

---
 Dockerfile                                    |  2 +-
 pom.xml                                       | 26 ++++++++++++++-----
 .../recorder/RecorderController.java          |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c0b843..83f65d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:21-jre
 COPY target/*.jar /opt/app.jar
 EXPOSE 8081
 ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
diff --git a/pom.xml b/pom.xml
index edcedf5..9c9b1ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,18 +5,17 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.4</version>
+		<version>3.2.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>de.juplo.kafka.wordcount</groupId>
 	<artifactId>recorder</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.1.001</version>
 	<name>Wordcount-Recorder</name>
 	<description>Recorder-service of the multi-user wordcount-example</description>
 	<properties>
-		<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
-		<java.version>11</java.version>
-		<kafka.version>2.8.0</kafka.version>
+		<java.version>21</java.version>
+		<docker-maven-plugin.version>0.44.0</docker-maven-plugin.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -28,8 +27,8 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka-clients</artifactId>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
@@ -57,10 +56,23 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/src/main/java/de/juplo/kafka/wordcount/recorder/RecorderController.java b/src/main/java/de/juplo/kafka/wordcount/recorder/RecorderController.java
index 5fe69ad..f7e32e2 100644
--- a/src/main/java/de/juplo/kafka/wordcount/recorder/RecorderController.java
+++ b/src/main/java/de/juplo/kafka/wordcount/recorder/RecorderController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 
 @RestController
-- 
2.20.1