Upgrade to JDK 17 (#560)

nagyesta · web-flow · commit 6b39f1e373b5 · 2024-01-02T21:44:57.000+01:00
- Upgrades Java versions to 17 - Upgrades Spring and Spring Boot to latest - Updates Logback to latest - Updates JSON Schema Validator - Stops using deprecated buildDir reference in Gradle config Resolves #377 {major} Signed-off-by: Esta Nagy <nagyesta@gmail.com>
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -72,11 +72,11 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Initialize CodeQL
         uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
         with:
diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
@@ -50,11 +50,11 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: 'Decode key (if Ubuntu)'
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
diff --git a/.github/workflows/gradle-oss-index-scan.yml b/.github/workflows/gradle-oss-index-scan.yml
@@ -17,11 +17,11 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Check dependencies with Gradle
         uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
         with:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -46,11 +46,11 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: 'Build with Gradle'
         uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
         with:
diff --git a/.github/workflows/update-dependency-checksums.yml b/.github/workflows/update-dependency-checksums.yml
@@ -13,11 +13,11 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.PUBLISH_KEY }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: "Remove previous version"
         run: cp gradle/verification-metadata-clean.xml gradle/verification-metadata.xml
       - name: "Update checksums"
diff --git a/.lift.toml b/.lift.toml
@@ -18,7 +18,7 @@ disableTools = ["errorprone"]
 # customTools = <list of user-provided tools conforming to a tool API>
 # allow = <list of users whose pull requests can trigger analysis>
 # jdkVersion = <jdk version>
-jdkVersion = "11"
+jdkVersion = "17"
 
 # summaryComments = <true or false (defaults to false)
 summaryComments = false
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.nagyesta.abort-mission/abort.mission-control?logo=apache-maven)](https://search.maven.org/search?q=com.github.nagyesta.abort-mission)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
@@ -31,7 +31,8 @@ save the Planet too! Cool, right?
 
 If you are still not convinced, you can trust the ancient proverb saying:
 
->"Shoot for the Moon, and even if you miss, you can at least stop running your failing tests early."
+> [!TIP]
+> "Shoot for the Moon, and even if you miss, you can at least stop running your failing tests early."
 
 ## Installation
 
diff --git a/boosters/booster-cucumber-jvm/README.md b/boosters/booster-cucumber-jvm/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](../../.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
 
diff --git a/boosters/booster-cucumber-jvm/build.gradle b/boosters/booster-cucumber-jvm/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 
 test {
     useJUnitPlatform {
-        systemProperty("abort-mission.report.directory", file("${buildDir}/reports/abort-mission/"))
+        systemProperty("abort-mission.report.directory", layout.buildDirectory.dir("reports/abort-mission/").get().getAsFile())
         includeTags 'unit', 'integration'
     }
 }
diff --git a/boosters/booster-junit-jupiter/README.md b/boosters/booster-junit-jupiter/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](../../.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
 
diff --git a/boosters/booster-junit-jupiter/build.gradle b/boosters/booster-junit-jupiter/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
 test {
     useJUnitPlatform {
-        systemProperty("abort-mission.report.directory", file("${buildDir}/reports/abort-mission/"))
+        systemProperty("abort-mission.report.directory", layout.buildDirectory.dir("reports/abort-mission/").get().getAsFile())
         includeTags 'unit', 'integration'
     }
 }
diff --git a/boosters/booster-junit4/README.md b/boosters/booster-junit4/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](../../.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
 
diff --git a/boosters/booster-junit4/src/test/java/com/github/nagyesta/abortmission/booster/junit4/StaticFireBoosterTest.java b/boosters/booster-junit4/src/test/java/com/github/nagyesta/abortmission/booster/junit4/StaticFireBoosterTest.java
@@ -27,13 +27,12 @@ public class StaticFireBoosterTest {
             .collect(Collectors.toList());
     private static final List<String> EXPECTED_DISPLAY_NAMES = List.of("testIsOnFire");
     private static final String EXCEPTION = UnsatisfiedDependencyException.class.getName();
-    private static final String MESSAGE_FORMAT = "Error creating bean with name 'com.github.nagyesta.abortmission.booster.junit4."
-            + "%s': Unsatisfied dependency expressed through field 'sideBooster'; nested exception "
-            + "is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sideBooster' defined "
-            + "in com.github.nagyesta.abortmission.testkit.spring.StaticFire: Bean instantiation via factory method failed; nested "
-            + "exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [com.github.nagyesta."
-            + "abortmission.testkit.spring.Booster]: Factory method 'sideBooster' threw exception; nested exception is java.lang."
-            + "UnsupportedOperationException: Side boosters are not supported.";
+    private static final String MESSAGE_FORMAT = "Error creating bean with name "
+            + "'com.github.nagyesta.abortmission.booster.junit4.%s': "
+            + "Unsatisfied dependency expressed through field 'sideBooster': Error creating bean "
+            + "with name 'sideBooster' defined in com.github.nagyesta.abortmission.testkit.spring.StaticFire: "
+            + "Failed to instantiate [com.github.nagyesta.abortmission.testkit.spring.Booster]: Factory method "
+            + "'sideBooster' threw exception with message: Side boosters are not supported.";
 
     private static final List<String> MESSAGES = Stream
             .of("StaticFireTestWithSideBoosters", "StaticFireTestWithSideBoostersParametrized")
diff --git a/boosters/booster-testng/README.md b/boosters/booster-testng/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](../../.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
 
diff --git a/boosters/booster-testng/build.gradle b/boosters/booster-testng/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 
 test {
     useTestNG {
-        systemProperty("abort-mission.report.directory", file("${buildDir}/reports/abort-mission/"))
+        systemProperty("abort-mission.report.directory", layout.buildDirectory.dir("reports/abort-mission/").get().getAsFile())
         includeGroups('unit', 'integration')
     }
 }
diff --git a/boosters/booster-testng/src/test/java/com/github/nagyesta/abortmission/booster/testng/StaticFireBoosterTest.java b/boosters/booster-testng/src/test/java/com/github/nagyesta/abortmission/booster/testng/StaticFireBoosterTest.java
@@ -60,12 +60,10 @@ public void testAssumption() throws NoSuchMethodException {
                             List.of("org.springframework.beans.factory.UnsatisfiedDependencyException"));
                     assertEquals(findThrowableMessagesForCountdownFailuresOf(evaluator), List.of("Error creating bean with name "
                             + "'com.github.nagyesta.abortmission.booster.testng.StaticFireTestWithSideBoosters': Unsatisfied dependency "
-                            + "expressed through field 'sideBooster'; nested exception is org.springframework.beans.factory."
-                            + "BeanCreationException: Error creating bean with name 'sideBooster' defined in com.github.nagyesta."
-                            + "abortmission.testkit.spring.StaticFire: Bean instantiation via factory method failed; nested exception "
-                            + "is org.springframework.beans.BeanInstantiationException: Failed to instantiate [com.github.nagyesta."
-                            + "abortmission.testkit.spring.Booster]: Factory method 'sideBooster' threw exception; nested exception is "
-                            + "java.lang.UnsupportedOperationException: Side boosters are not supported."));
+                            + "expressed through field 'sideBooster': Error creating bean with name 'sideBooster' defined in "
+                            + "com.github.nagyesta.abortmission.testkit.spring.StaticFire: Failed to instantiate "
+                            + "[com.github.nagyesta.abortmission.testkit.spring.Booster]: Factory method 'sideBooster' threw exception "
+                            + "with message: Side boosters are not supported."));
                 });
         MissionControl.matchingHealthChecks(STATIC_FIRE, StaticFireTestCenterCoreOnly.class.getDeclaredMethod("testIsOnFire"))
                 .forEach(evaluator -> {
diff --git a/boosters/testkit/README.md b/boosters/testkit/README.md
@@ -1,7 +1,7 @@
 ![Abort-Mission](../../.github/assets/Abort-Mission-logo_export_transparent_640.png)
 
 [![GitHub license](https://img.shields.io/github/license/nagyesta/abort-mission?color=informational)](https://raw.githubusercontent.com/nagyesta/abort-mission/main/LICENSE)
-[![Java version](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)](https://img.shields.io/badge/Java%20version-11-yellow?logo=java)
+[![Java version](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)](https://img.shields.io/badge/Java%20version-17-yellow?logo=java)
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/abort-mission?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/abort-mission/releases)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/abort-mission/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/abort-mission/actions/workflows/gradle.yml)
 
diff --git a/boosters/testkit/src/main/java/com/github/nagyesta/abortmission/testkit/spring/StaticFireTestAssets.java b/boosters/testkit/src/main/java/com/github/nagyesta/abortmission/testkit/spring/StaticFireTestAssets.java
@@ -53,11 +53,10 @@ public final class StaticFireTestAssets {
 
     public static final List<String> EXPECTED_EXCEPTIONS = List
             .of("org.springframework.beans.factory.BeanCreationException", "org.springframework.beans.factory.BeanCreationException");
-    private static final String MESSAGE = "Error creating bean with name 'sideBooster' defined in com.github.nagyesta.abortmission."
-            + "testkit.spring.StaticFire: Bean instantiation via factory method failed; nested exception is org.springframework.beans."
-            + "BeanInstantiationException: Failed to instantiate [com.github.nagyesta.abortmission.testkit.spring.Booster]: Factory method"
-            + " 'sideBooster' threw exception; nested exception is java.lang.UnsupportedOperationException: Side boosters are not "
-            + "supported.";
+    private static final String MESSAGE = "Error creating bean with name 'sideBooster' defined in "
+            + "com.github.nagyesta.abortmission.testkit.spring.StaticFire: Failed to instantiate "
+            + "[com.github.nagyesta.abortmission.testkit.spring.Booster]: Factory method 'sideBooster' "
+            + "threw exception with message: Side boosters are not supported.";
     public static final List<String> EXPECTED_MESSAGES = List.of(MESSAGE, MESSAGE);
 
     private StaticFireTestAssets() {
diff --git a/build.gradle b/build.gradle
@@ -73,9 +73,9 @@ configure(subprojects.findAll({
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
         toolchain {
-            languageVersion = JavaLanguageVersion.of(11)
+            languageVersion = JavaLanguageVersion.of(17)
         }
         withJavadocJar()
         withSourcesJar()
@@ -84,10 +84,10 @@ configure(subprojects.findAll({
     jacocoTestReport {
         reports {
             xml.required.set(true)
-            xml.outputLocation.set(file("$buildDir/reports/jacoco/report.xml"))
+            xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/report.xml").get().getAsFile())
             csv.required.set(false)
             html.required.set(true)
-            html.outputLocation.set(file("$buildDir/reports/jacoco/html"))
+            html.outputLocation.set(layout.buildDirectory.dir("reports/jacoco/html").get().getAsFile())
         }
     }
 
@@ -99,8 +99,8 @@ configure(subprojects.findAll({
     }
 
     jacocoTestCoverageVerification {
-        inputs.file(file("${buildDir}/reports/jacoco/report.xml") as String)
-        outputs.file(file("${buildDir}/reports/jacoco/jacocoTestCoverageVerification") as String)
+        inputs.file(layout.buildDirectory.file("reports/jacoco/report.xml").get().getAsFile())
+        outputs.file(layout.buildDirectory.file("reports/jacoco/jacocoTestCoverageVerification").get().getAsFile())
 
         violationRules {
             rule {
@@ -150,7 +150,7 @@ configure(subprojects.findAll({
             }
         }
         doLast {
-            file("${buildDir}/reports/jacoco/jacocoTestCoverageVerification").write("Passed")
+            layout.buildDirectory.file("reports/jacoco/jacocoTestCoverageVerification").get().getAsFile().write("Passed")
         }
     }
     jar.dependsOn check
@@ -160,7 +160,7 @@ configure(subprojects.findAll({
     }
 
     tasks.withType(Checkstyle).configureEach {
-        configProperties = [base_dir: rootDir.toString(), cache_file: file("${buildDir}/checkstyle/cacheFile")]
+        configProperties = [base_dir: rootDir.toString(), cache_file: layout.buildDirectory.file("checkstyle/cacheFile").get().getAsFile()]
         reports {
             xml.required.set(false)
             html.required.set(true)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-spring = "5.3.31"
-springBoot = "2.7.18"
+spring = "6.1.2"
+springBoot = "3.2.1"
 snakeYaml = "2.2"
 thymeleaf = "3.1.2.RELEASE"
 thymeleafExtrasTime = "3.0.4.RELEASE"
-logbackTest = "1.2.13"
-jsonSchemaValidator = "1.0.87"
+logbackTest = "1.4.14"
+jsonSchemaValidator = "1.1.0"
 logbackReport = "1.4.14"
 jackson = "2.16.1"
 gson = "2.10.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/mission-control/README.md b/mission-control/README.md
diff --git a/mission-control/build.gradle b/mission-control/build.gradle
diff --git a/mission-control/src/main/java/com/github/nagyesta/abortmission/core/AbortMissionCommandOps.java b/mission-control/src/main/java/com/github/nagyesta/abortmission/core/AbortMissionCommandOps.java
diff --git a/mission-control/src/main/java/com/github/nagyesta/abortmission/core/AbortMissionGlobalConfiguration.java b/mission-control/src/main/java/com/github/nagyesta/abortmission/core/AbortMissionGlobalConfiguration.java
diff --git a/mission-control/src/main/java/com/github/nagyesta/abortmission/core/outline/MissionOutline.java b/mission-control/src/main/java/com/github/nagyesta/abortmission/core/outline/MissionOutline.java
diff --git a/mission-report/flight-evaluation-report/README.md b/mission-report/flight-evaluation-report/README.md
diff --git a/mission-report/flight-evaluation-report/build.gradle b/mission-report/flight-evaluation-report/build.gradle
diff --git a/mission-report/flight-evaluation-report/src/main/java/com/github/nagyesta/abortmission/reporting/controller/ConversionController.java b/mission-report/flight-evaluation-report/src/main/java/com/github/nagyesta/abortmission/reporting/controller/ConversionController.java

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ dependencies {`
`24`	`24`
`25`	`25`	`test {`
`26`	`26`	`useJUnitPlatform {`
`27`		`- systemProperty("abort-mission.report.directory", file("${buildDir}/reports/abort-mission/"))`
	`27`	`+ systemProperty("abort-mission.report.directory", layout.buildDirectory.dir("reports/abort-mission/").get().getAsFile())`
`28`	`28`	`includeTags 'unit', 'integration'`
`29`	`29`	`}`
`30`	`30`	`}`