Upgrade spring, logback, avro

perkss · perkss · commit c1b5c392b630 · 2023-12-31T10:42:37.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,5 +8,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
       - name: Build with Maven
-        run: mvn install -Dmaven.compiler.target=11 -Dmaven.compiler.source=11
+        run: mvn install -Dmaven.compiler.target=17 -Dmaven.compiler.source=17
diff --git a/kafka-reactive-producer-consumer/src/main/resources/logback.groovy b/kafka-reactive-producer-consumer/src/main/resources/logback.groovy
diff --git a/kafka-reactive-producer-consumer/src/main/resources/logback.xml b/kafka-reactive-producer-consumer/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/kafka-reactive-producer-consumer/src/test/kotlin/com/perkss/kafka/reactive/FlowTest.kt b/kafka-reactive-producer-consumer/src/test/kotlin/com/perkss/kafka/reactive/FlowTest.kt
@@ -43,7 +43,7 @@ class FlowTest {
         @BeforeAll
         @JvmStatic
         internal fun beforeAll() {
-            val imageName = DockerImageName.parse("confluentinc/cp-kafka:7.0.0")
+            val imageName = DockerImageName.parse("confluentinc/cp-kafka:7.5.3")
             kafkaContainer = KafkaContainer(imageName)
             kafkaContainer.start()
             await until { kafkaContainer.isRunning }
@@ -103,4 +103,4 @@ class FlowTest {
 
     }
 
-}
+}
diff --git a/kafka-reactive-secure-producer-consumer/src/main/resources/logback.groovy b/kafka-reactive-secure-producer-consumer/src/main/resources/logback.groovy
diff --git a/kafka-reactive-secure-producer-consumer/src/main/resources/logback.xml b/kafka-reactive-secure-producer-consumer/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/kotlin-kafka-reactive-web/pom.xml b/kotlin-kafka-reactive-web/pom.xml
@@ -153,7 +153,7 @@
                     <args>
                         <arg>-Xjsr305=strict</arg>
                     </args>
-                    <jvmTarget>11</jvmTarget>
+                    <jvmTarget>${maven.compiler.source}</jvmTarget>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -187,4 +187,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/kotlin-kafka-reactive-web/src/main/resources/logback.groovy b/kotlin-kafka-reactive-web/src/main/resources/logback.groovy
diff --git a/kotlin-kafka-reactive-web/src/main/resources/logback.xml b/kotlin-kafka-reactive-web/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/kotlin-kafka-reactive-web/src/test/kotlin/com/perkss/reactive/SocialMediaPostsAcceptanceTest.kt b/kotlin-kafka-reactive-web/src/test/kotlin/com/perkss/reactive/SocialMediaPostsAcceptanceTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.TestConfiguration
-import org.springframework.boot.web.server.LocalServerPort
+import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.context.annotation.Bean
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.web.reactive.socket.WebSocketMessage
@@ -89,4 +89,4 @@ class SocialMediaPostsAcceptanceTest {
 
             }
     }
-}
+}
diff --git a/kotlin-kafka-streams-examples/src/main/kotlin/com/perkss/kafka/reactive/AppConfig.kt b/kotlin-kafka-streams-examples/src/main/kotlin/com/perkss/kafka/reactive/AppConfig.kt
@@ -19,6 +19,7 @@ import org.apache.kafka.streams.StreamsConfig
 import org.apache.kafka.streams.Topology
 import org.apache.kafka.streams.kstream.GlobalKTable
 import org.apache.kafka.streams.kstream.KTable
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -80,6 +81,7 @@ class AppConfig {
 
     @Bean
     fun orderProcessingTopology(
+        @Qualifier("streamConfig")
         streamConfig: Properties,
         streamsBuilder: StreamsBuilder,
         props: AppProperties,
@@ -117,7 +119,8 @@ class AppConfig {
     @Bean
     fun orderProcessingApp(
         orderProcessingTopology: Topology,
+        @Qualifier("streamConfig")
         streamConfig: Properties
     ) = KafkaStreams(orderProcessingTopology, streamConfig)
 
-}
+}
diff --git a/kotlin-kafka-streams-examples/src/main/resources/logback.groovy b/kotlin-kafka-streams-examples/src/main/resources/logback.groovy
diff --git a/kotlin-kafka-streams-examples/src/main/resources/logback.xml b/kotlin-kafka-streams-examples/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/kotlin-kafka-streams-examples/src/test/kotlin/com/perkss/kafka/reactive/integration/StreamIntegrationTest.kt b/kotlin-kafka-streams-examples/src/test/kotlin/com/perkss/kafka/reactive/integration/StreamIntegrationTest.kt
@@ -57,8 +57,8 @@ internal class StreamIntegrationTest @Autowired constructor(
         @BeforeAll
         @JvmStatic
         internal fun beforeAll() {
-            val kafkaImageName = DockerImageName.parse("confluentinc/cp-kafka:7.0.0")
-            val schemaRegistryImageName = DockerImageName.parse("confluentinc/cp-schema-registry:7.0.0")
+            val kafkaImageName = DockerImageName.parse("confluentinc/cp-kafka:7.5.3")
+            val schemaRegistryImageName = DockerImageName.parse("confluentinc/cp-schema-registry:7.5.3")
             kafka = KafkaContainer(kafkaImageName)
             kafka.apply {
                 withNetwork(Network.newNetwork())
@@ -193,4 +193,4 @@ internal class StreamIntegrationTest @Autowired constructor(
             )
         }
     }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -19,22 +19,23 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.source>17</maven.compiler.source>
         <kotlin.code.style>official</kotlin.code.style>
 
-        <kotlin.version>1.4.32</kotlin.version>
+        <kotlin.version>1.9.22</kotlin.version>
         <reactor.kafka.version>1.3.22</reactor.kafka.version>
-        <spring.boot.version>2.5.15</spring.boot.version>
+        <spring.boot.version>3.2.1</spring.boot.version>
         <kafka.version>3.6.1</kafka.version>
         <kafka-avro-serdes.version>7.5.1</kafka-avro-serdes.version>
         <avro.version>1.11.3</avro.version>
 
-        <junit.jupiter.version>5.7.0</junit.jupiter.version>
-        <junit.vintage.version>5.7.0</junit.vintage.version>
-        <testcontainers.version>1.16.3</testcontainers.version>
+        <junit.jupiter.version>5.10.1</junit.jupiter.version>
+        <junit.vintage.version>5.10.1</junit.vintage.version>
+        <testcontainers.version>1.19.3</testcontainers.version>
 
-        <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+        <maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
         <spring.cloud-version>2020.0.0</spring.cloud-version>
     </properties>
@@ -72,17 +73,17 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.27</version>
+                <version>2.0.10</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>1.3.14</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.2.9</version>
+                <version>1.3.14</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
@@ -195,6 +196,10 @@
 
     <build>
         <plugins>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Assertions.assertEquals`
`7`	`7`	`import org.junit.jupiter.api.Test`
`8`	`8`	`import org.springframework.boot.test.context.SpringBootTest`
`9`	`9`	`import org.springframework.boot.test.context.TestConfiguration`
`10`		`-import org.springframework.boot.web.server.LocalServerPort`
	`10`	`+import org.springframework.boot.test.web.server.LocalServerPort`
`11`	`11`	`import org.springframework.context.annotation.Bean`
`12`	`12`	`import org.springframework.test.context.ActiveProfiles`
`13`	`13`	`import org.springframework.web.reactive.socket.WebSocketMessage`
`@@ -89,4 +89,4 @@ class SocialMediaPostsAcceptanceTest {`
`89`	`89`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`-}`
	`92`	`+}`