From 7c2ddf8e86dc883a2039c530b3249d18daa2fefc Mon Sep 17 00:00:00 2001 From: Stefano Cordio Date: Sun, 13 Sep 2026 20:31:35 +0200 Subject: [PATCH] Bump default Eclipse JDT formatter version from 4.40 to 4.41 --- CHANGES.md | 3 +++ .../extra/java/EclipseJdtFormatterStep.java | 2 +- .../eclipse_jdt_formatter/v4.41.lockfile | 19 +++++++++++++++++++ .../EquoBasedStepBuilderLockfileTest.java | 2 +- plugin-gradle/CHANGES.md | 3 +++ plugin-maven/CHANGES.md | 3 +++ 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.41.lockfile diff --git a/CHANGES.md b/CHANGES.md index 77bd03bf2b..127d1f839f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] +### Changes +- Bump default Eclipse JDT formatter version from `4.40` to `4.41`. + ## [4.10.3] - 2026-09-25 ### Changes 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..2d50bea4b3 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.41"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion(); diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.41.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.41.lockfile new file mode 100644 index 0000000000..6825f3562c --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.41.lockfile @@ -0,0 +1,19 @@ +# Spotless formatter based on Eclipse-JDT 4.41 +org.eclipse.jdt:org.eclipse.jdt.core:3.47.0 +net.java.dev.jna:jna-platform:5.19.1 +org.eclipse.jdt:ecj:3.46.100 +org.eclipse.platform:org.eclipse.core.commands:3.13.0 +org.eclipse.platform:org.eclipse.core.contenttype:3.9.900 +org.eclipse.platform:org.eclipse.core.expressions:3.9.700 +org.eclipse.platform:org.eclipse.core.filesystem:1.11.500 +org.eclipse.platform:org.eclipse.core.jobs:3.15.900 +org.eclipse.platform:org.eclipse.core.resources:3.24.100 +org.eclipse.platform:org.eclipse.core.runtime:3.35.0 +org.eclipse.platform:org.eclipse.equinox.app:1.7.600 +org.eclipse.platform:org.eclipse.equinox.common:3.21.0 +org.eclipse.platform:org.eclipse.equinox.preferences:3.12.100 +org.eclipse.platform:org.eclipse.equinox.registry:3.12.600 +org.eclipse.platform:org.eclipse.equinox.supplement:1.12.300 +org.eclipse.platform:org.eclipse.osgi:3.24.300 +org.eclipse.platform:org.eclipse.text:3.14.800 +org.osgi:org.osgi.service.prefs:1.1.2 diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/EquoBasedStepBuilderLockfileTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/EquoBasedStepBuilderLockfileTest.java index b6d859e559..81b00d054d 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/EquoBasedStepBuilderLockfileTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/EquoBasedStepBuilderLockfileTest.java @@ -103,7 +103,7 @@ private static EquoBasedStepBuilder builderWithLockfilePath(String lockfilePath, "lockfile test formatter", mavenProvisioner, p2Provisioner, - "4.40", + "4.41", state -> input -> input, ImmutableMap.builder()) { @Override diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 03d0e63310..c0955726a6 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -4,6 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] +### Changes +- Bump default `eclipse` version from `4.40` to `4.41`. + ## [8.10.3] - 2026-09-25 ### Changes - Generate formatter defaults from version catalog. ([#3045](https://github.com/diffplug/spotless/pull/3045)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 11cf94060d..a5fd72c780 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -4,6 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] +### Changes +- Bump default `eclipse` version from `4.40` to `4.41`. + ## [3.10.3] - 2026-09-25 ### Changes - Generate formatter defaults from version catalog. ([#3045](https://github.com/diffplug/spotless/pull/3045))