Skip to content

Commit

Permalink
chore: bumps spring boot and spring kafka versions [AI:CoPilot] (#27)
Browse files Browse the repository at this point in the history
* chore: bumps spring boot and spring kafka versions [AI:CoPilot]

* chore: bumps version and adds 2.x.x compatibility info [AI:CoPilot]
  • Loading branch information
marcus-j authored Nov 12, 2024
1 parent 577bff1 commit e814b78
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish-maven-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e814b78

Please sign in to comment.