From 8dc463d33e21f2810701a6d4762ba088bc877d24 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:30:52 -0400 Subject: [PATCH 1/7] Bump Eclipse JDT from 4.35 to 4.40 --- .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java index 1e621d7886..83a3ea8d55 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java @@ -35,7 +35,7 @@ public final class EclipseJdtFormatterStep { private EclipseJdtFormatterStep() {} private static final String NAME = "eclipse jdt formatter"; - private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.35"); + private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.40"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion(); From d622e8b15b11d551266246775349b45418655ef7 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:35:25 -0400 Subject: [PATCH 2/7] Update changelog --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 4f2300afa5..9bbe9320f8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `javaparserVersion` option to the Cleanthat step, allowing callers to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) +- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) + ## [4.5.0] - 2026-03-18 ### Added From 723de851aa34cb1683873e38bcfc10a8b3b187e3 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:36:34 -0400 Subject: [PATCH 3/7] Add heading --- CHANGES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9bbe9320f8..8426039d00 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,7 +16,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) - Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) - ## [4.5.0] - 2026-03-18 ### Added - Add `tableTest` format type for standalone `.table` files. ([#2880](https://github.com/diffplug/spotless/pull/2880)) From fa9a11ddd512b23185ebaa1a65c6fb57b843cc56 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:37:16 -0400 Subject: [PATCH 4/7] Add to both plugins CHANGES.md --- plugin-gradle/CHANGES.md | 2 ++ plugin-maven/CHANGES.md | 1 + 2 files changed, 3 insertions(+) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 25215dae53..ea7b17425c 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -10,6 +10,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Fix `tableTestFormatter` editorconfig cache not honoring `.editorconfig` changes across Gradle daemon runs due to a shared static `EditorConfigProvider`. ([#2893](https://github.com/diffplug/spotless/pull/2893)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) +- Bump `eclipse-jdt` default version from `4.35` to `4.40`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) + ## [8.4.0] - 2026-03-18 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 8844f77e63..333ead4a69 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `` option to ``, allowing users to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) +- Bump `eclipse-jdt` default version from `4.35` to `4.40`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [3.4.0] - 2026-03-18 ### Added From e9a77c81098e00587778eb7fafb04a8c637fd95f Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Wed, 29 Apr 2026 15:11:24 -0400 Subject: [PATCH 5/7] Change to 4.39 Co-authored-by: Copilot --- .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 2 +- plugin-gradle/CHANGES.md | 3 +-- plugin-maven/CHANGES.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java index 83a3ea8d55..d140d03042 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java @@ -35,7 +35,7 @@ public final class EclipseJdtFormatterStep { private EclipseJdtFormatterStep() {} private static final String NAME = "eclipse jdt formatter"; - private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.40"); + private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.39"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion(); diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index ea7b17425c..7c20fc707c 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -10,8 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Fix `tableTestFormatter` editorconfig cache not honoring `.editorconfig` changes across Gradle daemon runs due to a shared static `EditorConfigProvider`. ([#2893](https://github.com/diffplug/spotless/pull/2893)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump `eclipse-jdt` default version from `4.35` to `4.40`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) - +- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [8.4.0] - 2026-03-18 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 333ead4a69..8caed29ec7 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `` option to ``, allowing users to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump `eclipse-jdt` default version from `4.35` to `4.40`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [3.4.0] - 2026-03-18 ### Added From 7008f5fe5be3893c9be446167053cc90883dfeb9 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Wed, 29 Apr 2026 16:24:50 -0400 Subject: [PATCH 6/7] Tweak wording --- CHANGES.md | 2 +- plugin-gradle/CHANGES.md | 2 +- plugin-maven/CHANGES.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8426039d00..ebe9d0bae5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `javaparserVersion` option to the Cleanthat step, allowing callers to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [4.5.0] - 2026-03-18 ### Added diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 7c20fc707c..900525a61c 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -10,7 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Fix `tableTestFormatter` editorconfig cache not honoring `.editorconfig` changes across Gradle daemon runs due to a shared static `EditorConfigProvider`. ([#2893](https://github.com/diffplug/spotless/pull/2893)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [8.4.0] - 2026-03-18 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 8caed29ec7..2e36a87f8c 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `` option to ``, allowing users to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump `eclipse-jdt` default version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) ## [3.4.0] - 2026-03-18 ### Added From 937b7e526576bcaf36cee6f34c78320d0e6a60b2 Mon Sep 17 00:00:00 2001 From: Jeremy Thompson <23730407+jhthompson@users.noreply.github.com> Date: Wed, 29 Apr 2026 16:26:04 -0400 Subject: [PATCH 7/7] Fix PR links --- CHANGES.md | 2 +- plugin-gradle/CHANGES.md | 2 +- plugin-maven/CHANGES.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ebe9d0bae5..3bb2ae6f56 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `javaparserVersion` option to the Cleanthat step, allowing callers to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) ## [4.5.0] - 2026-03-18 ### Added diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 900525a61c..e939b70b70 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -10,7 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Fix `tableTestFormatter` editorconfig cache not honoring `.editorconfig` changes across Gradle daemon runs due to a shared static `EditorConfigProvider`. ([#2893](https://github.com/diffplug/spotless/pull/2893)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) ## [8.4.0] - 2026-03-18 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 2e36a87f8c..70f0ec99c7 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Add `` option to ``, allowing users to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903)) ### Changes - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903)) -- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2902](https://github.com/diffplug/spotless/pull/2902)) +- Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) ## [3.4.0] - 2026-03-18 ### Added