Merge pull request #134 from wonderbird/upgrade-dependencies

Upgrade dependencies

.github/dependabot.yml

@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"

.github/workflows/build.yml

@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Build and Test with Gradle
@@ -63,10 +63,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Download Test Results

.sdkmanrc

@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.4-tem
-gradle=7.6.3
+java=21.0.2-tem
+gradle=8.6

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:jdk17 AS builder
+FROM gradle:jdk21 AS builder
 
 WORKDIR /home/gradle/src
 COPY --chown=gradle:gradle settings.gradle build.gradle ./

README.md

@@ -29,13 +29,13 @@ an [Open Source License](https://www.jetbrains.com/community/opensource/) for th
 
 The build is tested with the following versions:
 
-- [Java 17.0.4](https://adoptopenjdk.net/)
-- [Gradle 7.6.3](https://gradle.org/)
+- [Java 21.0.2](https://adoptopenjdk.net/)
+- [Gradle](https://gradle.org/) is configured by the [gradle-wrapper.properties](gradle/wrapper/gradle-wrapper.properties)
 
 ### Build the Solution and Run the Tests
 
 ```sh
-./gradlew clean build test
+./gradlew clean build test --warning-mode all
 ```
 
 ## Before Creating a Pull Request

build.gradle

@@ -1,14 +1,17 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.4'
-    id 'io.spring.dependency-management' version '1.0.14.RELEASE'
+    id 'org.springframework.boot' version '3.2.3'
+    id 'io.spring.dependency-management' version '1.1.0'
     id 'java'
     id 'jacoco'
     id 'com.github.kt3k.coveralls' version '2.12.0'
 }
 
 group = 'systems.boos'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
     mavenCentral()
@@ -29,9 +32,9 @@ dependencies {
     }
     testImplementation 'net.sourceforge.htmlunit:htmlunit:2.67.0'
 
-    testImplementation 'au.com.dius.pact.consumer:java8:4.1.39'
-    testImplementation 'au.com.dius.pact.consumer:junit5:4.3.14'
-    testImplementation 'au.com.dius.pact.provider:junit5spring:4.3.15'
+    testImplementation 'au.com.dius.pact.consumer:java8:4.1.42'
+    testImplementation 'au.com.dius.pact.consumer:junit5:4.6.7'
+    testImplementation 'au.com.dius.pact.provider:junit5spring:4.6.7'
 
     testImplementation 'org.json:json:20220924'
     testImplementation 'org.apache.commons:commons-collections4:4.4'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/systems/boos/traindelays/TrainDelaysController.java

@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import systems.boos.traindelays.model.Timetable;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.util.Optional;

src/test/java/systems/boos/traindelays/pact/TimetableConsumerPactTest.java

@@ -84,7 +84,7 @@ V4Pact timetableServerError(PactBuilder builder) {
     }
     @Test
     @PactTestFor(pactMethod = "timetableServerError")
-    void fetchChanges_whenTimetabelServerReturnsInternalServerError(MockServer mockServer) {
+    void fetchChanges_whenTimetableServerReturnsInternalServerError(MockServer mockServer) {
         fetchChanges_ShouldReturnEmptyTimetable(mockServer);
     }