Skip to content

Commit 74832f8

Browse files
authored
update default versions for Eclipse Java and Groovy formatters (#2458)
2 parents a175c94 + 934b01b commit 74832f8

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ This document is intended for Spotless developers.
1010
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
1111

1212
## [Unreleased]
13+
### Changed
14+
* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
15+
* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
1316

1417
## [3.1.1] - 2025-04-07
1518
### Changed

lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public final class GrEclipseFormatterStep {
3333
private GrEclipseFormatterStep() {}
3434

3535
private static final String NAME = "eclipse groovy formatter";
36-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.32");
36+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.35");
3737

3838
public static String defaultVersion() {
3939
return JVM_SUPPORT.getRecommendedFormatterVersion();
@@ -69,6 +69,8 @@ protected P2Model model(String version) {
6969
model.addFilterAndValidate("no-debug", filter -> {
7070
filter.exclude("org.eclipse.jdt.debug");
7171
});
72+
// work around https://github.com/groovy/groovy-eclipse/issues/1617
73+
model.useMavenCentral = false;
7274
return model;
7375
}
7476

lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class EclipseJdtFormatterStep {
3434
private EclipseJdtFormatterStep() {}
3535

3636
private static final String NAME = "eclipse jdt formatter";
37-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.34");
37+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.35");
3838

3939
public static String defaultVersion() {
4040
return JVM_SUPPORT.getRecommendedFormatterVersion();

plugin-gradle/CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
44

55
## [Unreleased]
6+
### Changed
7+
* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
8+
* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
69

710
## [7.0.3] - 2025-04-07
811
### Changed

plugin-maven/CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
44

55
## [Unreleased]
6+
### Changed
7+
* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
8+
* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
69

710
## [2.44.4] - 2025-04-07
811
### Changed

0 commit comments

Comments
 (0)