Skip to content

Commit e814b78

Browse files
authored
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]
1 parent 577bff1 commit e814b78

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

.github/workflows/maven-publish-github.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-java@v4
2020
with:
2121
distribution: 'adopt'
22-
java-version: '11'
22+
java-version: '17'
2323
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2424
settings-path: ${{ github.workspace }} # location for the settings.xml file
2525

.github/workflows/maven-publish-maven-central.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'adopt'
30-
java-version: '11'
30+
java-version: '17'
3131
server-id: ossrh
3232
server-username: MAVEN_USERNAME
3333
server-password: MAVEN_PASSWORD

.github/workflows/maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
- uses: actions/setup-java@v4
2020
with:
2121
distribution: 'adopt'
22-
java-version: '11'
22+
java-version: '17'
2323
- name: Build with Maven
2424
run: mvn -B verify --file pom.xml

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ deckard:
149149
Deckard was originally built on Spring Kafka 2.0.x which is only compatible with Spring Boot 2.0.x.
150150
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:
151151

152+
- 2.x -> supports Spring Kafka 3.2.x and is compatible with Spring Boot 3.3.x
152153
- 1.x -> supports Spring Kafka 2.2.x and is compatible with Spring Boot 2.1.x
153154
- 0.x (LEGACY) -> supports Spring Kafka 2.1.x and is compatible with Spring Boot 2.0.x
154155

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>de.idealo.kafka</groupId>
77
<artifactId>deckard</artifactId>
8-
<version>1.0.6-RELEASE</version>
8+
<version>2.0.0-RELEASE</version>
99
<packaging>jar</packaging>
1010

1111
<name>Deckard</name>
@@ -57,14 +57,14 @@
5757
<parent>
5858
<groupId>org.springframework.boot</groupId>
5959
<artifactId>spring-boot-starter-parent</artifactId>
60-
<version>2.7.18</version>
60+
<version>3.3.5</version>
6161
<relativePath/>
6262
</parent>
6363

6464
<properties>
6565
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6666
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
67-
<java.version>1.8</java.version>
67+
<java.version>17</java.version>
6868
<maven-failsafe.version>3.5.2</maven-failsafe.version>
6969
</properties>
7070

src/test/java/de/idealo/kafka/deckard/configuration/OverrideAutoConfigurationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.assertj.core.api.Assertions.assertThat;
1717

1818
@ExtendWith(SpringExtension.class)
19-
@SpringBootTest
19+
@SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true")
2020
class OverrideAutoConfigurationTest {
2121

2222
@Autowired

0 commit comments

Comments
 (0)