Merge remote-tracking branch 'upstream/main' into groupIconColumn

* upstream/main:
  Bump com.puppycrawl.tools:checkstyle from 10.12.5 to 10.12.7 (#10812)
  Bump DavidAnson/markdownlint-cli2-action from 14 to 15 (#10816)
  Bump actions/cache from 3 to 4 (#10815)
  Bump org.gradle.toolchains.foojay-resolver-convention (#10811)
  Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.11 (#10810)
  Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.1 to 2.22.1 (#10814)
  Update to javafx 21.0.2 (#10808)

.github/workflows/check-links.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           show-progress: 'false'
       - name: Restore lychee cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .lycheecache
           key: cache-lychee-${{ github.sha }}

.github/workflows/tests.yml

@@ -100,7 +100,7 @@ jobs:
           submodules: 'false'
           show-progress: 'false'
       - name: markdownlint-cli2-action
-        uses: DavidAnson/markdownlint-cli2-action@v14
+        uses: DavidAnson/markdownlint-cli2-action@v15
         with:
           globs: |
             *.md

build.gradle

@@ -101,7 +101,7 @@ dependencyLocking {
 }
 
 javafx {
-    version = "20"
+    version = "21.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
@@ -187,15 +187,15 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.17.2'
     implementation 'com.konghq:unirest-java:3.14.5'
 
-    implementation 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.slf4j:slf4j-api:2.0.11'
     implementation "org.tinylog:tinylog-api:2.6.2"
     implementation "org.tinylog:slf4j-tinylog:2.6.2"
     implementation "org.tinylog:tinylog-impl:2.6.2"
 
     // route all requests to java.util.logging to SLF4J (which in turn routes to tinylog)
     implementation 'org.slf4j:jul-to-slf4j:2.0.9'
     // route all requests to log4j to SLF4J
-    implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.21.1'
+    implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.22.1'
 
     implementation('de.undercouch:citeproc-java:3.0.0-beta.2') {
         exclude group: 'org.antlr'
@@ -253,7 +253,7 @@ dependencies {
     testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:10.12.5'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.12.7'
     // xjc needs the runtime as well for the ant task, otherwise it fails
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
@@ -263,6 +263,12 @@ dependencies {
     rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
     rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")
     rewrite("org.openrewrite.recipe:rewrite-migrate-java")
+
+    configurations.checkstyle {
+        resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+            select("com.google.guava:guava:0")
+        }
+    }
 }
 
 clean {

settings.gradle

@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "JabRef"