From ca9c21e188bda0d0f23826abd944fccfb729dbc8 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Wed, 10 Jul 2024 16:12:28 +0200
Subject: [PATCH] counter: 1.1.0 - UPDATE 001

---
 Dockerfile                                    |  2 +-
 pom.xml                                       | 32 ++++++++++++++++---
 .../counter/CounterStreamProcessor.java       |  4 +--
 src/main/resources/application.properties     |  2 --
 src/main/resources/application.yml            |  7 ++++
 src/test/resources/logback-test.xml           |  5 +++
 6 files changed, 42 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/resources/application.properties
 create mode 100644 src/main/resources/application.yml
 create mode 100644 src/test/resources/logback-test.xml

diff --git a/Dockerfile b/Dockerfile
index d2218b8..795c6ac 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 8083
 ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
diff --git a/pom.xml b/pom.xml
index 4fe2235..5c7ade8 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>counter</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.0.001</version>
 	<name>Wordcount-Counter</name>
 	<description>Word-counting stream-processor 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>
@@ -31,6 +30,10 @@
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka-streams</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -48,15 +51,34 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<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>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</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/counter/CounterStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
index 4d3bcc4..5248609 100644
--- a/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/counter/CounterStreamProcessor.java
@@ -14,8 +14,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index c52cd9c..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-server.port=8083
-management.endpoints.web.exposure.include=*
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..d940f22
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+server:
+  port: 8083
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..171bf63
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <logger name="de.juplo.kafka.wordcount.counter" level="DEBUG" />
+</configuration>
-- 
2.20.1