From f0403e7d3d984ad3006ea00a8fd2eb8b1f4dc10a Mon Sep 17 00:00:00 2001 From: Jochen Berger Date: Tue, 12 May 2026 13:14:10 +0200 Subject: [PATCH 1/3] Update default Greclipse version --- CHANGES.md | 1 + .../spotless/extra/groovy/GrEclipseFormatterStep.java | 6 ++++-- plugin-gradle/CHANGES.md | 1 + plugin-maven/CHANGES.md | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ee531ac510..41d3df2dfb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -38,6 +38,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Use Eclipse JDT's collator-based comparison when sorting Java members to better match Eclipse save actions. ([#2920](https://github.com/diffplug/spotless/pull/2920)) - 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`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) +* Bump default `greclipse` version to latest `4.35` -> `4.39`. ([#2924](https://github.com/diffplug/spotless/pull/2924)) ## [4.5.0] - 2026-03-18 ### Added diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java index 49b6d44dd6..5d0f82b4fe 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java @@ -34,7 +34,7 @@ public final class GrEclipseFormatterStep { private GrEclipseFormatterStep() {} private static final String NAME = "eclipse groovy 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.38").add(21, "4.39"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion(); @@ -52,7 +52,9 @@ protected P2Model model(String version) { throw new IllegalArgumentException("4.8 is the oldest version we support, this was " + version); } String greclipseVersion; - if (eVersion >= 28) { + if (eVersion >= 38) { + greclipseVersion = "6." + (eVersion - 38) + ".0"; + } else if (eVersion >= 28) { greclipseVersion = "5." + (eVersion - 28) + ".0"; } else if (eVersion >= 18) { greclipseVersion = "4." + (eVersion - 18) + ".0"; diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index d0fde86d5f..a6492a83f4 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -36,6 +36,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) - Make `spotlessPredeclare` visible to Gradle Kotlin DSL type-safe accessors. ([#2925](https://github.com/diffplug/spotless/pull/2925)) - Allow `spotlessPredeclare` to be used directly without enabling it first in spotless extension. ([#2925](https://github.com/diffplug/spotless/pull/2925)) +* Bump default `greclipse` version to latest `4.35` -> `4.39`. ([#2924](https://github.com/diffplug/spotless/pull/2924)) ## [8.4.0] - 2026-03-18 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 81dc370d2f..eedfac8c9d 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -36,6 +36,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Use Eclipse JDT's collator-based comparison when sorting Java members to better match Eclipse save actions. ([#2920](https://github.com/diffplug/spotless/pull/2920)) - 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`. ([#2912](https://github.com/diffplug/spotless/pull/2912)) +* Bump default `greclipse` version to latest `4.35` -> `4.39`. ([#2924](https://github.com/diffplug/spotless/pull/2924)) ## [3.4.0] - 2026-03-18 ### Added From b6251f8ebb55cdd20325ea98ce7ef5cf77da32e1 Mon Sep 17 00:00:00 2001 From: Jochen Berger Date: Fri, 29 May 2026 12:08:40 +0200 Subject: [PATCH 2/3] desperate measures... --- .../java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java index a7b4b11de1..bdcfb018a9 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java @@ -125,6 +125,8 @@ public FormatterStep build() { P2Model model = createModelWithMirrors(); P2ModelWrapper modelWrapper = P2ModelWrapper.wrap(model); List classpath = p2Provisioner.provisionP2Dependencies(modelWrapper, mavenProvisioner, cacheDirectory); + // work around https://github.com/equodev/equo-ide/pull/193 + classpath = classpath.stream().filter(f -> !f.getName().contains("groovy-test")).toList(); return JarState.preserveOrder(classpath); }), stepProperties.build()); return FormatterStep.create(formatterName, roundtrippableState, EquoStep::state, stateToFormatter); From fcc5d4719c1982289d114cbe7d88cdf873a74d6b Mon Sep 17 00:00:00 2001 From: jochenberger Date: Fri, 29 May 2026 12:41:29 +0200 Subject: [PATCH 3/3] Do not use 4.38 due to broken signing --- .../diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java index 5d0f82b4fe..346d7e2a49 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java @@ -34,7 +34,7 @@ public final class GrEclipseFormatterStep { private GrEclipseFormatterStep() {} private static final String NAME = "eclipse groovy formatter"; - private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.38").add(21, "4.39"); + private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(17, "4.37").add(21, "4.39"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion();