From 2465bd58eb2c2324b0425898f9aa74bae220e472 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sun, 21 Jan 2024 12:17:20 +0100 Subject: [PATCH 1/7] Update to javafx 21.0.2 (#10808) Fixes #5867 Probably also #10731 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index adbe1385c9f..b6ec2d3ff77 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ dependencyLocking { } javafx { - version = "20" + version = "21.0.2" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ] } From 558420a6b5c3650c5f02428f0166acd56df9ef83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:08:52 +0000 Subject: [PATCH 2/7] Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.1 to 2.22.1 (#10814) Bumps org.apache.logging.log4j:log4j-to-slf4j from 2.21.1 to 2.22.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-to-slf4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b6ec2d3ff77..8f2c6fa9b64 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ dependencies { // 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' From aab14a3ce1c19ddcc1b8d1bc71d716f0f7e6ae20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:11:56 +0000 Subject: [PATCH 3/7] Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.11 (#10810) Bumps org.slf4j:slf4j-api from 2.0.9 to 2.0.11. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f2c6fa9b64..94918b4634a 100644 --- a/build.gradle +++ b/build.gradle @@ -187,7 +187,7 @@ 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" From 6128328778d381d0bb9bcfd34f503b4bdc099790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:11:58 +0000 Subject: [PATCH 4/7] Bump org.gradle.toolchains.foojay-resolver-convention (#10811) Bumps org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0d665b1d64f..18e2f97a57c 100644 --- a/settings.gradle +++ b/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" From 5cda653e38d9d9d7e8fbc0b90a34cec9973c492a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:15:42 +0000 Subject: [PATCH 5/7] Bump actions/cache from 3 to 4 (#10815) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/check-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index 74819a02d19..8b4dea4f9ac 100644 --- a/.github/workflows/check-links.yml +++ b/.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 }} From bd785e6c6270a5e171fd325ccf68bfd1822fff14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:18:27 +0000 Subject: [PATCH 6/7] Bump DavidAnson/markdownlint-cli2-action from 14 to 15 (#10816) Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 14 to 15. - [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases) - [Commits](https://github.com/davidanson/markdownlint-cli2-action/compare/v14...v15) --- updated-dependencies: - dependency-name: DavidAnson/markdownlint-cli2-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index af7f28c8fc0..633ef53ba68 100644 --- a/.github/workflows/tests.yml +++ b/.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 From 1f9a578d5083506b6e4d4eb080d7662219a39e26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 21:27:58 +0000 Subject: [PATCH 7/7] Bump com.puppycrawl.tools:checkstyle from 10.12.5 to 10.12.7 (#10812) * Bump com.puppycrawl.tools:checkstyle from 10.12.5 to 10.12.7 Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.5 to 10.12.7. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.5...checkstyle-10.12.7) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * resolve issues --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Siedlerchr --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 94918b4634a..a998b34abb4 100644 --- a/build.gradle +++ b/build.gradle @@ -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 {