Skip to content

Commit b8dd8cf

Browse files
authored
fix changelogs / update Greclipse (#3123)
2 parents 0a5757f + 89acdf2 commit b8dd8cf

4 files changed

Lines changed: 22 additions & 10 deletions

File tree

‎CHANGES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1616
- Bump default `gherkin` version `42.0.0` -> `42.0.1`. ([#3088](https://github.com/diffplug/spotless/pull/3088))
1717
- Bump default `jackson` version `2.22.2` -> `2.22.3`. ([#3101](https://github.com/diffplug/spotless/pull/3101))
1818
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3103](https://github.com/diffplug/spotless/pull/3103))
19-
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
20-
19+
- Bump default `mockito-core` version `5.23.0` -> `5.24.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
20+
- Bump default `greclipse` version to latest `4.40` -> `4.41`. ([#3123](https://github.com/diffplug/spotless/pull/3123))
2121

2222
### Fixed
2323
- `shortenFullyQualifiedTypes` leaves a qualified name alone when the enclosing type extends or implements a type that is not in the same file, so an inherited member type cannot take the simple name. ([#3117](https://github.com/diffplug/spotless/issues/3117))

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

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

3636
private static final String NAME = "eclipse groovy formatter";
37-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "4.36").add(21, "4.40");
37+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(17, "4.36").add(21, "4.41");
3838

3939
public static String defaultVersion() {
4040
return JVM_SUPPORT.getRecommendedFormatterVersion();
@@ -70,6 +70,20 @@ protected P2Model model(String version) {
7070
"org.eclipse.jdt.groovy.core",
7171
"org.codehaus.groovy"));
7272
model.addFilterAndValidate("no-debug", filter -> filter.exclude("org.eclipse.jdt.debug"));
73+
74+
model.addFilterAndValidate("no-unused", filter -> {
75+
filter.exclude("org.eclipse.equinox.supplement");
76+
filter.exclude("org.eclipse.jdt.core.manipulation");
77+
filter.exclude("org.eclipse.jdt.ui");
78+
79+
filter.excludePrefix("com.sun.jna");
80+
filter.excludePrefix("org.eclipse.equinox.p2");
81+
filter.excludePrefix("org.eclipse.ltk");
82+
filter.excludePrefix("org.eclipse.team");
83+
filter.excludePrefix("org.eclipse.swt");
84+
filter.excludePrefix("org.eclipse.ui");
85+
});
86+
7387
// work around https://github.com/groovy/groovy-eclipse/issues/1617
7488
model.useMavenCentral = false;
7589
return model;

‎plugin-gradle/CHANGES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
99
- Bump default `gherkin` version `42.0.0` -> `42.0.1`. ([#3088](https://github.com/diffplug/spotless/pull/3088))
1010
- Bump default `jackson` version `2.22.2` -> `2.22.3`. ([#3101](https://github.com/diffplug/spotless/pull/3101))
1111
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3103](https://github.com/diffplug/spotless/pull/3103))
12-
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
13-
12+
- Bump default `mockito-core` version `5.23.0` -> `5.24.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
13+
- Bump default `greclipse` version to latest `4.40` -> `4.41`. ([#3123](https://github.com/diffplug/spotless/pull/3123))
1414

1515
### Fixed
1616
- `shortenFullyQualifiedTypes` leaves a qualified name alone when the enclosing type extends or implements a type that is not in the same file, so an inherited member type cannot take the simple name. ([#3117](https://github.com/diffplug/spotless/issues/3117))

‎plugin-maven/CHANGES.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
99
- Bump default `gherkin` version `42.0.0` -> `42.0.1`. ([#3088](https://github.com/diffplug/spotless/pull/3088))
1010
- Bump default `jackson` version `2.22.2` -> `2.22.3`. ([#3101](https://github.com/diffplug/spotless/pull/3101))
1111
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3103](https://github.com/diffplug/spotless/pull/3103))
12-
- Bump default `palantir-java-format` version `2.98.0` -> `2.99.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
13-
12+
- Bump default `mockito-core` version `5.23.0` -> `5.24.0`. ([#3106](https://github.com/diffplug/spotless/pull/3106))
13+
- Bump default `greclipse` version to latest `4.40` -> `4.41`. ([#3123](https://github.com/diffplug/spotless/pull/3123))
1414

1515
### Fixed
16+
- Migrate Plexus component injection to JSR-330 and Maven parameter. ([#3122](https://github.com/diffplug/spotless/pull/3122))
1617
- `shortenFullyQualifiedTypes` leaves a qualified name alone when the enclosing type extends or implements a type that is not in the same file, so an inherited member type cannot take the simple name. ([#3117](https://github.com/diffplug/spotless/issues/3117))
1718

18-
### Fixed
19-
Migrate Plexus component injection to JSR-330 and Maven parameter. ([#3122](https://github.com/diffplug/spotless/pull/3122))
20-
2119
## [3.10.3] - 2026-09-25
2220
### Changes
2321
- Generate formatter defaults from version catalog. ([#3045](https://github.com/diffplug/spotless/pull/3045))

0 commit comments

Comments
 (0)