From f2e5a41d6ee6b871ec508309c68b11b0e0b1f3fa Mon Sep 17 00:00:00 2001 From: Katharina Schmid Date: Wed, 6 Dec 2023 17:05:46 +0100 Subject: [PATCH 1/2] Bump Spring Boot to 3.1.6 --- spring-boot-pathfinder/pom.xml | 8 +++++++- .../dbmdz/pathfinder/spring/PathfinderProperties.java | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-boot-pathfinder/pom.xml b/spring-boot-pathfinder/pom.xml index b590ed7..0af9870 100644 --- a/spring-boot-pathfinder/pom.xml +++ b/spring-boot-pathfinder/pom.xml @@ -11,7 +11,7 @@ Pathfinder: Spring Boot Bindings - 2.7.5 + 3.1.6 1.3.2 @@ -37,6 +37,12 @@ org.springframework.boot spring-boot-starter-test ${version.spring-boot} + + + org.slf4j + slf4j-api + + javax.annotation diff --git a/spring-boot-pathfinder/src/main/java/com/github/dbmdz/pathfinder/spring/PathfinderProperties.java b/spring-boot-pathfinder/src/main/java/com/github/dbmdz/pathfinder/spring/PathfinderProperties.java index c9a91c5..27141a6 100644 --- a/spring-boot-pathfinder/src/main/java/com/github/dbmdz/pathfinder/spring/PathfinderProperties.java +++ b/spring-boot-pathfinder/src/main/java/com/github/dbmdz/pathfinder/spring/PathfinderProperties.java @@ -2,11 +2,9 @@ import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.lang.Nullable; /** Spring properties file to load Pathfinder configuration application.yml. */ -@ConstructorBinding @ConfigurationProperties(prefix = "pathfinder") public class PathfinderProperties { From 21153f76a7c36191a4d70d248abf00eda2346cd6 Mon Sep 17 00:00:00 2001 From: Katharina Schmid Date: Thu, 7 Dec 2023 08:47:41 +0100 Subject: [PATCH 2/2] Switch to Java 17 --- .github/workflows/ci.yml | 6 +++--- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e37946..e2b8a45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [11, 17] + java: [17] steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -34,12 +34,12 @@ jobs: needs: build steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: check-latest: true distribution: temurin - java-version: 11 + java-version: 17 server-id: ossrh-snapshots server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/pom.xml b/pom.xml index 33dab36..ac3132f 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ pathfinder - 11 - 11 + 17 + 17 UTF-8 3.24.2