From 60c4a8226d76c5c6ff0bc0d234b8868d2928a8ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:07:56 +0000 Subject: [PATCH 1/4] fix(deps): update dependency org.eclipse.jgit:org.eclipse.jgit to v7 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d853a4cc2..6fb9da2351 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,7 +29,7 @@ VER_SLF4J=[1.6,2.0[ # Used in multiple places VER_DURIAN=1.2.0 -VER_JGIT=6.10.1.202505221210-r +VER_JGIT=7.3.0.202506031305-r VER_JUNIT=5.13.4 VER_ASSERTJ=3.27.3 VER_MOCKITO=5.18.0 From 47011f8d80d59e98f2485368ff2eb9c343a392f7 Mon Sep 17 00:00:00 2001 From: ntwigg Date: Mon, 21 Jul 2025 11:56:08 -0700 Subject: [PATCH 2/4] Remove workaround introduced in 0c66cb0 --- .../com/diffplug/spotless/extra/GitAttributesLineEndings.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java index 85d8416c0b..9327ea4c23 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java @@ -192,8 +192,6 @@ static class RuntimeInit { ///////////////////////////////// // USER AND SYSTEM-WIDE VALUES // ///////////////////////////////// - FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless")); // this fixes a problem - // that was only occurring on Java 11. If we remove support for Java 11, we could probably remove it. systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); Errors.log().run(systemConfig::load); userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED); From 8a4159a2d35f8b2d149897b17419722e91428ec0 Mon Sep 17 00:00:00 2001 From: ntwigg Date: Mon, 21 Jul 2025 11:59:40 -0700 Subject: [PATCH 3/4] Bump changelogs. --- CHANGES.md | 3 +++ plugin-gradle/CHANGES.md | 3 +++ plugin-maven/CHANGES.md | 3 +++ 3 files changed, 9 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 44b6266a75..a1660296fa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Changes * **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) +* Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) + * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) + * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [3.3.0] - 2025-07-20 diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index bdcc8c43f2..f9c1fb5a96 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Changed * **BREAKING** Bump the required Gradle to `7.3` and required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) +* Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) + * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) + * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [7.2.0] - 2025-07-20 diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 5de90f5430..9cc7e602d9 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -5,6 +5,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Changes * **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) +* Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257)) + * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765)) + * Should improve the search for system-global git config. * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345)) ## [2.46.0] - 2025-07-20 From 735bcf64ab2fc7697f2df79d556d411a4d5c1653 Mon Sep 17 00:00:00 2001 From: ntwigg Date: Mon, 21 Jul 2025 12:16:00 -0700 Subject: [PATCH 4/4] Revert "Remove workaround introduced in 0c66cb0" This reverts commit 47011f8d80d59e98f2485368ff2eb9c343a392f7. --- .../com/diffplug/spotless/extra/GitAttributesLineEndings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java index 9327ea4c23..85d8416c0b 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java @@ -192,6 +192,8 @@ static class RuntimeInit { ///////////////////////////////// // USER AND SYSTEM-WIDE VALUES // ///////////////////////////////// + FS.DETECTED.setGitSystemConfig(new File("no-global-git-config-for-spotless")); // this fixes a problem + // that was only occurring on Java 11. If we remove support for Java 11, we could probably remove it. systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); Errors.log().run(systemConfig::load); userConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED);