From e814b786f031223de5570234a27ee66a4bf586d1 Mon Sep 17 00:00:00 2001
From: Marcus Janke <18111840+marcus-j@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:42:34 +0100
Subject: [PATCH] chore: bumps spring boot and spring kafka versions
 [AI:CoPilot] (#27)

* chore: bumps spring boot and spring kafka versions [AI:CoPilot]

* chore: bumps version and adds 2.x.x compatibility info [AI:CoPilot]
---
 .github/workflows/maven-publish-github.yml                  | 2 +-
 .github/workflows/maven-publish-maven-central.yml           | 2 +-
 .github/workflows/maven.yml                                 | 2 +-
 README.md                                                   | 1 +
 pom.xml                                                     | 6 +++---
 .../configuration/OverrideAutoConfigurationTest.java        | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven-publish-github.yml b/.github/workflows/maven-publish-github.yml
index 0fc5459..e9e664b 100644
--- a/.github/workflows/maven-publish-github.yml
+++ b/.github/workflows/maven-publish-github.yml
@@ -19,7 +19,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
diff --git a/.github/workflows/maven-publish-maven-central.yml b/.github/workflows/maven-publish-maven-central.yml
index cda4c9c..1fb2e41 100644
--- a/.github/workflows/maven-publish-maven-central.yml
+++ b/.github/workflows/maven-publish-maven-central.yml
@@ -27,7 +27,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1080dab..0243095 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,6 +19,6 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
     - name: Build with Maven
       run: mvn -B verify --file pom.xml
diff --git a/README.md b/README.md
index 528a5f5..a11ec8f 100644
--- a/README.md
+++ b/README.md
@@ -149,6 +149,7 @@ deckard:
 Deckard was originally built on Spring Kafka 2.0.x which is only compatible with Spring Boot 2.0.x.
 To go forward with development for Spring Boot 2.1.x, but also support projects based on Spring Boot 2.0.x, we introduced the following versioning scheme:
 
+- 2.x -> supports Spring Kafka 3.2.x and is compatible with Spring Boot 3.3.x
 - 1.x -> supports Spring Kafka 2.2.x and is compatible with Spring Boot 2.1.x
 - 0.x (LEGACY) -> supports Spring Kafka 2.1.x and is compatible with Spring Boot 2.0.x
 
diff --git a/pom.xml b/pom.xml
index badf4da..d5a1a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>de.idealo.kafka</groupId>
     <artifactId>deckard</artifactId>
-    <version>1.0.6-RELEASE</version>
+    <version>2.0.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Deckard</name>
@@ -57,14 +57,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven-failsafe.version>3.5.2</maven-failsafe.version>
     </properties>
 
diff --git a/src/test/java/de/idealo/kafka/deckard/configuration/OverrideAutoConfigurationTest.java b/src/test/java/de/idealo/kafka/deckard/configuration/OverrideAutoConfigurationTest.java
index 906b7e6..141d8a7 100644
--- a/src/test/java/de/idealo/kafka/deckard/configuration/OverrideAutoConfigurationTest.java
+++ b/src/test/java/de/idealo/kafka/deckard/configuration/OverrideAutoConfigurationTest.java
@@ -16,7 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
-@SpringBootTest
+@SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true")
 class OverrideAutoConfigurationTest {
 
     @Autowired